unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Eliza Velasquez <exv@google.com>
Cc: emacs-devel@gnu.org
Subject: Re: ediff merge wrapper
Date: Tue, 03 Nov 2020 18:47:17 +0200	[thread overview]
Message-ID: <838sbicrqi.fsf@gnu.org> (raw)
In-Reply-To: <CAK1djOrtK8x_jdwsqZh1NaN3g6FtWKnDD_7nUU7goKkNCGYAPg@mail.gmail.com> (message from Eliza Velasquez on Mon, 2 Nov 2020 12:01:33 -0800)

> From: Eliza Velasquez <exv@google.com>
> Date: Mon, 2 Nov 2020 12:01:33 -0800
> 
> Internally at Google, we have a wrapper performing an ediff merge with
> emacs/emacsclient which blocks until the merge operation has
> completed. It automatically handles edge cases such as creating a new
> frame over ssh in tty mode or being invoked as an emacs subprocess. I
> think it would be really useful to upstream a tool like this, given
> that using emacs as a merge tool that can be invoked by software such
> as mercurial or perforce can be very fiddly or have unexpected
> behavior.

Can you describe the use of this tool in more detail, and what
enhancements it implements beyond what emacsclient provides?  I don't
think I understand that from your short description.

Thanks.



  parent reply	other threads:[~2020-11-03 16:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-02 20:01 ediff merge wrapper Eliza Velasquez
2020-11-03  9:23 ` Daniel Martín
2020-11-03 16:42 ` chad
2020-11-03 16:47 ` Eli Zaretskii [this message]
2020-11-03 18:44   ` Eliza Velasquez
2020-11-05  2:18     ` Eliza Velasquez

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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=838sbicrqi.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=exv@google.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 public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).