diff options
| author | David Cramer <dcramer@gmail.com> | 2016-11-26 10:46:57 -0600 |
|---|---|---|
| committer | David Cramer <dcramer@gmail.com> | 2016-11-26 10:46:57 -0600 |
| commit | 9bcba5c06d6c963bb203cffc6bdee95e42d549e1 (patch) | |
| tree | 27e8161f9684fb582434c9111659ec9d9eac4a18 | |
| parent | 65a98b8d2aca76b09646799b55e45eb8b69340dc (diff) | |
| download | raven-9bcba5c06d6c963bb203cffc6bdee95e42d549e1.tar.gz | |
Improve merging of CHANGES
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8383fff --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGES merge=union |