On 23/2/10 13:31 , Evan Martin wrote:
Run WebKitTools/Scripts/resolve-ChangeLogs each time you rebase.
Or run once:git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
tor arne _______________________________________________ webkit-dev mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
