The difference between update and merge

[Dennis Brakhane]

Am 06.12.2011 22:52, schrieb Dennis Brakhane:
> $ hg resolve afile --tool internal:local
> or
> $ hg resolve afile
> to redo the merge?
One more thing:
If the merge of the file was "successful", you would need to do a
$ hg resolve -u afile
first (or just "-u" to mark all resolved files as unresolved)

I admit that it's not as intuitive as the rest of core mercurial...

Greetings,
  Dennis