src/3rdparty/webkit/.gitattributes
author Eckhart Koeppen <eckhart.koppen@nokia.com>
Fri, 16 Apr 2010 11:39:52 +0300
branchRCL_3
changeset 8 740e5562c97f
parent 7 3f74d0d4af4c
permissions -rw-r--r--
8b5beb2a553102639e9eb38c8f8f0f6775e8545b

# 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