Danek Duvall <danek.duvall at sun.com> writes: > http://cr.opensolaris.org/~dduvall/sfw-mercurial-1.0-2/ > > Here's the second round, with Rich's patch to fix 1052 applied, as well as > a few other fixes found in codereview.
[the conglomerate of Matt's patch(es) that fix 1052...] > I sent a copy of patchlist.diff to the mercurial list yesterday, and Matt > seemed at least okay with the idea, so I hope this won't be necessary to > carry for long (though neither should the 1052 patch). Do we want to ship a default system-wide hgrc with a sensible config for merge (mergetools.hgrc, but slightly adjusted I would imagine)? I'm not sure I have much of an opinion either way, at this point, but it would seem defaulting to trying meld (when meld is in SFW) would be sensible. -- Rich
