> it should be > possible to create a custom [merge "cl-merge"] in your git config file, > which points to a script designed specifically for resolving changelog > conflicts
I would love such a script, instead of constantly having to do conflict resolution at the top of ChangeLog. Bruno
