Andreas Schwab wrote: > >> As required by git. > > > > What do you mean by that? > > See rerere.c:is_cmarker.
Please give a "how to reproduce". git-merge-changelog fails with an exit code 1 when there is a conflict. This should be enough to alert git about a merge problem and let it hand over the problem to the user. If you don't give more info, I have to conclude that there is no actual problem. Bruno
