[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ediff merge wrapper
From: |
Eli Zaretskii |
Subject: |
Re: ediff merge wrapper |
Date: |
Tue, 03 Nov 2020 18:47:17 +0200 |
> 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.