Re: git is screwed

[Steinar Bang]

>>>>> Eli Zaretskii <address@hidden>:

> What's wrong with smerge-mode?

I haven't tried it yet.  I just heard about it 24 days ago (the thread
"smerge-mode is fantastic, but it annoys me").

> It should kick in automatically when you have conflict markers,

Um... since when...?  24.4?  Or git master HEAD?

> and also invoke "git add" automatically for every file saved after
> resolving all of its conflicts.

Is that configurable?  It sounds like a step I would like to control
myself.