diff options
Diffstat (limited to 'src/3rdparty/webkit/.gitattributes')
| -rw-r--r-- | src/3rdparty/webkit/.gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/.gitattributes b/src/3rdparty/webkit/.gitattributes new file mode 100644 index 0000000..5b43bd0 --- /dev/null +++ b/src/3rdparty/webkit/.gitattributes @@ -0,0 +1,4 @@ +# To enable automatic merging of ChangeLog files, use the following command: +# git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B" +ChangeLog* merge=changelog + |