src/3rdparty/webkit/.gitattributes
author Eckhart Koeppen <eckhart.koppen@nokia.com>
Wed, 21 Apr 2010 11:15:19 +0300
branchRCL_3
changeset 11 25a739ee40f4
parent 7 3f74d0d4af4c
permissions -rw-r--r--
3a438a6e0b41f1ef657ef0e648d352db636204aa

# 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