Re: VC mode and git

[Stephen J. Turnbull]

Steinar Bang writes:

 > > IIUC git's pull is not atomic.  When the merge fails with a message like
 > > the above I have no idea in what state my copy of a repository is in.
 > 
 > It is in the same state it was as before you did the pull.

No, in the repo origin/master has been updated.  It's true that master
has not been updated and the working tree is untouched.  Of course
this difference is probably not apparent to most users.