Re: master 11abc4a: Merge remote-tracking branch 'origin/scratch/lexical-gnus' into trunk

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

  > Careful: there are those (including yours truly) who think that this
  > is a terrible misfeature, which only benefits people with too much
  > time on their hands and the wish to understand the innards of Git.

I share your feelings about Git.  Ever since a friend explained
concretely how to handle conflicts, I can use Git, but I still prefer
CVS.

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