[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Looking for a helper for advanced conflicts resolution.
From: |
Sergey Organov |
Subject: |
Re: Looking for a helper for advanced conflicts resolution. |
Date: |
Fri, 24 Jul 2020 22:56:30 +0300 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
Michael Heerdegen <michael_heerdegen@web.de> writes:
> Sergey Organov <sorganov@gmail.com> writes:
>
>> Yeah, that was my first candidate, and I've tried to invoke it from
>> magit, but it doesn't seem indeed to have the feature. Implementing it
>> probably is not a big deal indeed [...]
>
> I did implement that but haven't yet packaged it.
Thanks for letting know it's coming! Exactly as it should be for
Swiss-army knife of merging and diffing.
-- Sergey
Re: Looking for a helper for advanced conflicts resolution., Yuri Khan, 2020/07/24