diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2017-09-04 10:34:52 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-09-04 10:43:15 +0100 |
| commit | 618262519955a03d6017783e0b9a43fee3d565e4 (patch) | |
| tree | d9944074754a2eafc110b7f1a83776df72ec33d2 | |
| parent | 413fcabdef0af55d5bc1a649bc3af221600ce171 (diff) | |
| download | nix-618262519955a03d6017783e0b9a43fee3d565e4.zip | |
use better merge algorithm for CHANGELOG.md
see also: https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..3d432e03 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/CHANGELOG.md merge=union |