[webkit-dev] [PATCH] JSCore with GDB

[Sergio Villar Senin]

En 28/12/11 12:38, Sanjoy Das escribiu:
> I've not included ChangeLog entries since they are a pain to rebase,
> I'll add them once the code has been reviewed.

Add the following to your .gitconfig

[merge "changelog"]
	driver = resolve-ChangeLogs --merge-driver %O %A %B

and assuming you have Tools/Scripts is in your PATH it will
automatically rebase the ChangeLogs for you.

BR