[PATCH 0 of 1] Select internal conflict resolution tool with a merge option

Dirkjan Ochtman dirkjan at ochtman.nl
Sun Mar 7 07:50:42 CST 2010


On Sun, Mar 7, 2010 at 14:11, Isaac Jurado <diptongo at gmail.com> wrote:
> In order to achieve dummy merges, one has two options:
>
>    hg --config ui.merge=internal:local merge
>    hg debugsetparents . other_head

Actually the nice version IMO is hg revert -r. -a.

Cheers,

Dirkjan


More information about the Mercurial-devel mailing list