Bruno Haible writes:
> Andreas Schwab wrote:
>> >> As required by git.
>> >
>> > What do you mean by that?
>>
>> See rerere.c:is_cmarker.
>
> Please give a "how to reproduce".
Enable rerere and cherry-pick a conflicting changelog.
Andreas.
--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fin
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 th
Bruno Haible writes:
> Hello Andreas,
>
>> As required by git.
>
> What do you mean by that?
See rerere.c:is_cmarker.
Andreas.
--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Hello Andreas,
> As required by git.
What do you mean by that? The user is expected to resolve the conflict,
and this implies removing the <<< and >>> markers, before doing
"git add conflicting-file".
In other words: Please give a reproducible recipe for experiencing a
problem that occur
As required by git.
Andreas.
2011-01-09 Andreas Schwab
* lib/git-merge-changelog.c (conflict_write): Add space after
conflict marker.
---
lib/git-merge-changelog.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/git-merge-changelog.c b/lib/git-
