Question

Here is the scenario

1
|\
| \
2  3
| /
|/
4*

While doing hg merge, I got into 4* where I have conflicts in my files. Since I forgot to mention GUI tool, I now want to start a GUI tool

$ hg merge --tool meld
abort: outstanding uncommitted merges

So I can’t seem to fix the issue without rolling back the conflict. Is there any way to do this?

In git I would easily do git mergetool and it would load a GUI anytime.

Answer 1

Use hg resolve to restart a merge. You can do

$ hg resolve foo

to restart the merge of just the foo file, or you can do

$ hg resolve --all

to restart the merge from scratch. Use

$ hg resolve --list

to see the progress of your merge — unresolved files are marked with an U.