David Levin wrote:
I think someone already wrote this for you:
http://ivanz.com/2009/03/19/git-automatic-smart-changelog-merging/
which referrs to
http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c;h=b9ab42947b2590b31d69544d566e1f6b04a90100;hb=HEAD
A merge-driver would be cool.
Here's a wip patch to update-webkit's Git part I've been running locally
for a few days now, it has basic resolve-ChangeLogs-support, as well as
mirror support:
http://gist.github.com/287646
It might help a little bit on the way to a more non-wrapped future.
tor arne
_______________________________________________
webkit-dev mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
