Eli Zaretskii <[email protected]> wrote: > Richard Stallman <[email protected]> wrote: >> When I got the conflict, it displayed several windows. I did not know what >> these windows were showing me, so I was totally unable to proceed. I did >> not dare try to find out by trial and error what those windows were showing, >> not when committing something to the Emacs master! All I could do was stop >> and touch nothing. >> >> Was it Smerge mode which put up those windows? Or was it something else? > > It couldn't have been Smerge mode, because that one doesn't show any windows, > AFAIK.
Maybe, it was ediff-mode?
signature.asc
Description: PGP signature
