diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-07-02 10:33:57 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-07-02 10:33:57 +0200 |
| commit | 9eb1959057bebe66cec1ed27e7d5ccbab7a4255c (patch) | |
| tree | a700dec4c57e93247a795d0cff6d25c3d06d2c54 | |
| parent | cce72a703988d70939d22df2b00cc3fd63436322 (diff) | |
| download | external_gettext-9eb1959057bebe66cec1ed27e7d5ccbab7a4255c.zip external_gettext-9eb1959057bebe66cec1ed27e7d5ccbab7a4255c.tar.gz external_gettext-9eb1959057bebe66cec1ed27e7d5ccbab7a4255c.tar.bz2 | |
Specify custom merge drivers.
| -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 |