Merging is a pain, and doing it with conflict markers is just cruel. We should include a pre-configured merge tool. Someone said there are KDiff3 binaries for Windows, so I might go with that. I find KDiff3 to be quite pleasant to use on Linux.
Huh, I love merge markers... you really prefer a graphical tool?
Yeah, I do. It's pretty easy to configure your preference in your hgrc/Mercurial.ini anyway, I just think we should be providing a graphical tool by default.
Assignee: nobody → ted.mielczarek
I pushed a change to install and include KDiff3: http://hg.mozilla.org/mozilla-build/rev/229d064bf766 Needs some testing, but I think it's good.
Status: NEW → RESOLVED
Last Resolved: 9 years ago
Resolution: --- → FIXED
Summary: include a configured merge tool (maybe KDiff3) → include a configured merge tool (KDiff3)
Seems to work fine in this test build: http://people.mozilla.com/~tmielczarek/MozillaBuildSetup-1.4pre.exe
You need to log in before you can comment on or make changes to this bug.