> From: Richard Stallman <[email protected]> > Cc: [email protected], [email protected] > Date: Sat, 09 Nov 2019 13:04:23 -0500 > > 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? 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?
