Re: Making git as easy as CVS, for handling merge conflicts

[Richard Stallman]

[[[ 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. ]]]

  > > If smerge mode is useful in this situation, how about making its use
  > > into an option supported for all back-ends for which conflicts are 
possible?

  > It already is used by all back-ends, and they all work the same wrt
  > conflicts, at the level we are talking here.

How about adding a user option to enable or disable the creation of
the multiple windows?

(Is it Smerge mode which does that?)

-- 
Dr Richard Stallman
Founder, Free Software Foundation (https://gnu.org, https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)