diff options
| author | Alan Somers <asomers@gmail.com> | 2017-09-06 08:26:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 08:26:51 -0600 |
| commit | 37186c421956b5c249afab25c436232a0461a7c0 (patch) | |
| tree | d9944074754a2eafc110b7f1a83776df72ec33d2 | |
| parent | 413fcabdef0af55d5bc1a649bc3af221600ce171 (diff) | |
| parent | 618262519955a03d6017783e0b9a43fee3d565e4 (diff) | |
| download | nix-37186c421956b5c249afab25c436232a0461a7c0.zip | |
Merge pull request #763 from Mic92/merge-union
use better merge algorithm for CHANGELOG.md
| -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 |