You can still use filemerge from Teamware, and that's what I currently recommend inside SWAN.
Just put the following inside your .hgrc: > [merge-tools] > filemerge.gui=True > filemerge.args=-a $base $local $other $output > filemerge.priority=1 > > meld.gui=True > meld.priority=0 and make sure that filemerge is in your $PATH: % which filemerge /ws/onnv-tools/teamware/bin/filemerge %
