From: Michael Heerdegen <michael_heerdegen@web.de>
To: Sergey Organov <sorganov@gmail.com>
Cc: help-gnu-emacs@gnu.org
Subject: Re: Looking for a helper for advanced conflicts resolution.
Date: Sat, 25 Jul 2020 00:29:23 +0200 [thread overview]
Message-ID: <87h7tweed8.fsf@web.de> (raw)
In-Reply-To: <87a6zolma9.fsf@osv.gnss.ru> (Sergey Organov's message of "Fri, 24 Jul 2020 22:56:30 +0300")
Sergey Organov <sorganov@gmail.com> writes:
> > 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.
Don't expect that it appears soon, however. I can send something
privately all the time. But I don't like how Ediff is coded, and it's
not fun for me to hack it and provide something "official". But if I
can't make it in this life, then ehm... what came after that again?
Michael.
next prev parent reply other threads:[~2020-07-24 22:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 11:07 Looking for a helper for advanced conflicts resolution Sergey Organov
2020-07-24 16:25 ` Michael Heerdegen
2020-07-24 18:15 ` Sergey Organov
2020-07-24 19:08 ` wgreenhouse
2020-07-24 19:48 ` Michael Heerdegen
2020-07-24 19:56 ` Sergey Organov
2020-07-24 22:29 ` Michael Heerdegen [this message]
2020-07-25 11:37 ` John Yates
2020-07-24 19:06 ` Yuri Khan
2020-07-24 19:49 ` Sergey Organov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h7tweed8.fsf@web.de \
--to=michael_heerdegen@web.de \
--cc=help-gnu-emacs@gnu.org \
--cc=sorganov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.