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

  > I think that ediff3, or ediff-files3, is an Emacs interface to the diff3
  > algorithm, which I know does the same for three versions, but,
  > perhaps much like you, it confuses me a lot.  Some people do
  > prefer to handle merge conflicts with it.

If so, why did a VC command invoke this automatically
without my requesting it?

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