diff options
| author | Gabriel Scherer <gabriel.scherer@gmail.com> | 2017-02-26 11:44:31 -0500 |
|---|---|---|
| committer | Gabriel Scherer <gabriel.scherer@gmail.com> | 2017-02-26 11:44:31 -0500 |
| commit | c1c78f019218efb30309036724c7c4ab8d484689 (patch) | |
| tree | 360ce52588d26dda6691737b1dd070f97cb0fbcb /.gitattributes | |
| parent | 1b279065faad7fd37f2d5dfcce8906bc078ba746 (diff) | |
| download | ocaml-c1c78f019218efb30309036724c7c4ab8d484689.tar.gz | |
use 'union' merge driver for Changes
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index be13cb1a01..b7a82d0ccf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,6 +24,11 @@ *.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 +/Changes merge=union + # No header for text files (would be too obtrusive). *.md ocaml-typo=missing-header README* ocaml-typo=missing-header |