Reputation:
Get back the good old non-interactive diff tool in Mercurial
Since a recent upgrade, Mercurial gives me a graphical interface to merge/conflicts. I don't want it; I just want the files marked with <<<< ==== >>>> in the good old fashion, to let me go through the conflicts with leisure, instead of the order some crummy diff tool decides. How do I get it back? The help I find is all about switching to the exact tools I do not want.
Upvotes: 1
Views: 77
Answers (1)
Reputation: 12514
In the [ui] section of your .hgrc, add
merge=internal:merge
See mercurial docs.
I'm with you about this choice of tools. The merge tools are clearly very clever, but if I've got a conflict like this, it's typically because I've messed up somehow, at least a little bit, and I'd like to fix things up nice and slow, so I'm confident I know what's where and why.
Upvotes: 2
Related Questions
- Is possible to change the default diff tool in Mercurial?
- Can Mercurial use a better diff tool to more efficiently store its changesets?
- How do I get mercurial to show the diff during `hg com`?
- Mercurial equivalent to hg qdiff?
- Mercurial - How do I diff with a previous version?
- Mercurial equivalent of git whatchanged?
- Mercurial - why doesn't diff work?
- Beyond Compare as default diff tool in Eclipse when using Mercurial?
- Mercurial: Better command line diff?
- How to view Mercurial changeset changes using a GUI diff tool