|
| From: | Stefan Monnier |
| Subject: | Re: changelog-merge plugin and edited ChangeLog entries |
| Date: | Sat, 26 Feb 2011 14:53:25 -0500 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
> The gnulib "git-merge-changelog" merge program[*] is reported to
> handle this case correctly, and supposedly can be used with either git
> or bzr (or hg).
I haven't had too many problems related to this with change-log-mode's
change-log-resolve-conflict either.
Stefan
| [Prev in Thread] | Current Thread | [Next in Thread] |