src/3rdparty/webkit/.gitattributes
author Eckhart Koeppen <eckhart.koppen@nokia.com>
Mon, 19 Apr 2010 10:15:19 +0300
branchRCL_3
changeset 9 b5b118452c7d
parent 7 3f74d0d4af4c
permissions -rw-r--r--
a8c775f23625952540b5349744722bcb9e37de45

# 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