Re: VC mode and git

[Harald Hanche-Olsen]

Eli Zaretskii wrote:
> Note the "merge conflict" part and the error message Richard cites:
> "fix conflicts and then commit the result."  This is a message
> displayed by Git when you have a conflict in _committed_ changes, and
> the merge fails half-way through.  Error messages about conflicts in
> uncommitted changes are different

Indeed. But then the lack of any files marked U in the output of “git 
status -s” is puzzling. Instead, there is just lisp/ChangeLog, marked 
MM. Perhaps that is a side effect of something else he did.

– Harald