diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-07-02 10:31:10 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-07-02 10:31:10 +0200 |
| commit | 5868508b8b74fafe2873aa0ace8030c9d406c969 (patch) | |
| tree | af651fce0af24e608eb02de27093e2ed66eada93 | |
| parent | 2adc7253aef58fdafa6cd9bddf740611c64ba582 (diff) | |
| download | gperf-5868508b8b74fafe2873aa0ace8030c9d406c969.tar.gz | |
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 |