Re: git is screwed

[Stefan Monnier]

>> 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.


        Stefan