all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sergey Organov <sorganov@gmail.com>
To: Michael Heerdegen <michael_heerdegen@web.de>
Cc: help-gnu-emacs@gnu.org
Subject: Re: Looking for a helper for advanced conflicts resolution.
Date: Fri, 24 Jul 2020 22:56:30 +0300	[thread overview]
Message-ID: <87a6zolma9.fsf@osv.gnss.ru> (raw)
In-Reply-To: <871rl0g0dm.fsf@web.de> (Michael Heerdegen's message of "Fri, 24 Jul 2020 21:48:37 +0200")

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



  reply	other threads:[~2020-07-24 19:56 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 [this message]
2020-07-24 22:29         ` Michael Heerdegen
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=87a6zolma9.fsf@osv.gnss.ru \
    --to=sorganov@gmail.com \
    --cc=help-gnu-emacs@gnu.org \
    --cc=michael_heerdegen@web.de \
    /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.