FWIW I am quiet happy with meld http://meldmerge.org/
with this configuration in mercurial.ini [merge-tools] meld.args = -a -L local $local -L base $base -L other $other ------------------------------------------------------------------------------ _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
