[Top][All Lists]

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

Re: git is screwed

From: Stefan Monnier
Subject: Re: git is screwed
Date: Thu, 26 Mar 2015 18:34:21 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux)

>> Is that configurable?

Not currently, no.

>> It sounds like a step I would like to control myself.

There's a (recentish) bug report about that, indeed.

> It's a minor mode, so of course it's configurable: just switch it off.

The "git add" part is independent from smerge-mode (tho they're linked
by the fact that they both depend on the VC backend being able to
recognize that a file has conflicts).  So turning smerge-mode off won't help.


reply via email to

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