Closed
Bug 493029
Opened 15 years ago
Closed 15 years ago
include a configured merge tool (KDiff3)
Categories
(Firefox Build System :: MozillaBuild, task)
Tracking
(Not tracked)
RESOLVED
FIXED
People
(Reporter: ted, Assigned: ted)
Details
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.
Comment 1•15 years ago
|
||
Huh, I love merge markers... you really prefer a graphical tool?
Assignee | ||
Comment 2•15 years ago
|
||
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 | ||
Updated•15 years ago
|
Assignee: nobody → ted.mielczarek
Assignee | ||
Comment 3•15 years ago
|
||
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
Closed: 15 years ago
Resolution: --- → FIXED
Assignee | ||
Updated•15 years ago
|
Summary: include a configured merge tool (maybe KDiff3) → include a configured merge tool (KDiff3)
Assignee | ||
Comment 4•15 years ago
|
||
Seems to work fine in this test build: http://people.mozilla.com/~tmielczarek/MozillaBuildSetup-1.4pre.exe
Updated•1 year ago
|
Product: mozilla.org → Firefox Build System
You need to log in
before you can comment on or make changes to this bug.
Description
•