src/3rdparty/webkit/.gitattributes
author William Roberts <williamr@symbian.org>
Mon, 21 Jun 2010 22:38:13 +0100
branchGCC_SURGE
changeset 27 93b982ccede2
parent 19 fcece45ef507
permissions -rw-r--r--
Mark extraneous symbols as ABSENT (bug 3065)

# 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