[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Avoiding the three-windows merging with Git

From: Eli Zaretskii
Subject: Re: Avoiding the three-windows merging with Git
Date: Mon, 25 Nov 2019 05:32:07 +0200

> From: Richard Stallman <address@hidden>
> Date: Sun, 24 Nov 2019 22:14:27 -0500
> Has anyone figured out why merge conflicts go into a mode
> with three windows, and some way to turn that off
> without breaking anything else?

No.  The only idea was that you somehow inadvertently started Ediff.
That shouldn't be necessary, and doesn't happen automatically, so it's
unclear how it happened, if it did.

> I would really appreciate that help, since with it I could make
> another attempt to use Git, and perhaps this time understand how to
> cope with the conflicts.

I suggest that you try, and if something goes wrong, describe what you
see, and the output of "C-h l" at that point.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]