Previously, we had 27 [merge "changelog"] 28 driver = ../OpenSource/Tools/Scripts/resolve-ChangeLogs --fix-merged --merge-driver %O %A %B entry via webkit-patch setup-git-clone. But now, this is not registered.
*** This bug has been marked as a duplicate of bug 231345 ***