[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Making git as easy as CVS, for handling merge conflicts
From: |
Richard Stallman |
Subject: |
Re: Making git as easy as CVS, for handling merge conflicts |
Date: |
Mon, 11 Nov 2019 22:17:56 -0500 |
[[[ To any NSA and FBI agents reading my email: please consider ]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> > What does Ediff mode do? Does it make three windows side by side?
> When Emacs is running on TTY: yes, it does. (While on graphical display —
two windows side by side and one more in a new frame.)
So, how and where does vc invoke this, and is there a way to turn that off?
--
Dr Richard Stallman
Founder, Free Software Foundation (https://gnu.org, https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)
- Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/10
- Re: Making git as easy as CVS, for handling merge conflicts, Óscar Fuentes, 2019/11/10
- Re: Making git as easy as CVS, for handling merge conflicts, Dmitry Alexandrov, 2019/11/11
- Re: Making git as easy as CVS, for handling merge conflicts, martin rudalics, 2019/11/11
- Re: Making git as easy as CVS, for handling merge conflicts, Dmitry Alexandrov, 2019/11/11
- Re: Making git as easy as CVS, for handling merge conflicts, martin rudalics, 2019/11/12
- Re: Making git as easy as CVS, for handling merge conflicts, Dmitry Alexandrov, 2019/11/16
- Re: Making git as easy as CVS, for handling merge conflicts, martin rudalics, 2019/11/16
Re: Making git as easy as CVS, for handling merge conflicts,
Richard Stallman <=
Re: Making git as easy as CVS, for handling merge conflicts, João Távora, 2019/11/11
Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/11