diff -r 2f34d5167611 -r fcece45ef507 src/3rdparty/webkit/.gitattributes
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/3rdparty/webkit/.gitattributes	Mon May 03 13:17:34 2010 +0300
@@ -0,0 +1,4 @@
+# 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
+