bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] git-merge-changelog: fix missing space after conflict marker


From: Bruno Haible
Subject: Re: [PATCH] git-merge-changelog: fix missing space after conflict markers
Date: Sun, 9 Jan 2011 13:55:48 +0100
User-agent: KMail/1.9.9

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]