http://bugs.grommit.com/show_bug.cgi?id=476
richlowe at richlowe.net changed:
What |Removed |Added
----------------------------------------------------------------------------
BugsThisDependsOn| |478
------- Comment #1 from richlowe at richlowe.net 2008-04-17 15:09 PDT -------
I'm setting this to block on bug #478 (Hg 1.0), since it really requires the
new merge machinery.
I'd also suggest we reverse the logic in comment #0, such that we prefer
filemerge, and fall back to meld, which should provide the minimum of shock to
internal users.
The only possibly negative behaviour I know of with filemerge is that it will
ask for confirmation when saving, as it is overwriting an existing file. For
all I know, this may be normal.
--
Configure bugmail: http://bugs.grommit.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
