Re: VC mode and git

[Harald Hanche-Olsen]

Sergey Organov wrote:
> Eli Zaretskii<address@hidden>  writes:
> > A merge does much more than just commit.  At least AFAIU.
>
> Dunno what you have in mind. After true merge operation is finished, the
> only result of it is single commit appended to your current branch. Git
> /is/ that simple. All the possible complexity is in the stage of content
> preparation for this commit.

Yes, but that complexity can be considerable. Isn't it reasonable to 
assume that that is what Eli had in mind?

– Harald