[Top][All Lists]

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

bug#29366: gitmerge to handle NEWS better

From: David Engster
Subject: bug#29366: gitmerge to handle NEWS better
Date: Tue, 12 Dec 2017 21:10:42 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3.50 (gnu/linux)

Glenn Morris writes:
> David Engster wrote:
>> I'm not sure about that smerge stuff either, that was something I took
>> over from bzrmerge. It may be that it is not functional. I hope I can
>> make time to take a look at this in the coming days.
> Thanks! Here's my revised patch for this. It just does a commit after a
> successful auto-conflict resolution. It seems to work...

Indeed, that final commit was missing. It works for me as well.


reply via email to

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