Re: VC mode and git

[martin rudalics]

> The only way to make git do the merge is to move away the uncommitted
> changes, either by committing them,

IIUC this will fail miserably with

git commit -a

as I sketched in the scenario I posted earlier.

martin