summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/.gitattributes
blob: 5b43bd02a0185a1025aa98177909e1dc5d7beae0 (plain)
1
2
3
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