src/3rdparty/webkit/.gitattributes
author Eckhart Koeppen <eckhart.koppen@nokia.com>
Wed, 21 Apr 2010 09:15:16 +0300
branchRCL_3
changeset 11 68d3b337861b
parent 8 3f74d0d4af4c
permissions -rw-r--r--
bac24638cd0e032feaaaf81f375284a059242729

# 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