diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-03-14 17:28:31 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-03-14 17:28:31 +0100 |
| commit | 9466b2848f1dbf449ee547d39b5bbf332f44fbae (patch) | |
| tree | bdc0692f86baf136784889240d6046d3e24a7f7a /.gitattributes | |
| parent | 229302d50f27385cbac3b255e50e22e10aff1faa (diff) | |
| download | libunistring-9466b2848f1dbf449ee547d39b5bbf332f44fbae.tar.gz | |
Specify custom merge drivers.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..ca4ea27 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog |