diff options
| author | Gabriel Scherer <gabriel.scherer@gmail.com> | 2017-02-24 20:56:34 -0500 |
|---|---|---|
| committer | Gabriel Scherer <gabriel.scherer@gmail.com> | 2017-02-24 21:02:22 -0500 |
| commit | 4316882c9c734094b79439de091ddbc0f2cce197 (patch) | |
| tree | 918e2786d3781d2d791dbdec4a5c4bd18560125c /.gitattributes | |
| parent | 70f84eef2dd50aa5f45e99ac8042398d428093b6 (diff) | |
| download | ocaml-4316882c9c734094b79439de091ddbc0f2cce197.tar.gz | |
use 'text' as merge driver for .mailmap
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index be13cb1a01..4b6592d6f9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,6 +24,10 @@ *.png binary *.tfm binary +# 'union' merge driver just unions textual content in case of conflict +# http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/ +/.mailmap merge=union + # No header for text files (would be too obtrusive). *.md ocaml-typo=missing-header README* ocaml-typo=missing-header |