[[[ 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. ]]]
> > How about adding a user option to enable or disable the creation of > > the multiple windows? > > > > (Is it Smerge mode which does that?) > Smerge mode doesn't, so we need first to figure out what feature did > that. > When you got the merge conflict, was that by invoking "git pull" from > the shell prompt, or did you do it in some other way? I don't actually remember -- I can only try to reconstruct what happened. But I think it must have been a VC operation done in Emacs. I probably did git pull with the shell, not with VC, because it is not a per-file operation. > And once you got the indication of the conflict, did you simply visit > the file with conflicts, or did you do something else? IOW, what can > you remember about the commands and actions you did before those > windows popped up? I don't know. -- Dr Richard Stallman Founder, Free Software Foundation (https://gnu.org, https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)