Looking at hgmerge it's obvious nobody agreed on any common option parsing
rules for merge tools. :^(
Watch out for your PATH setting. The hgmerge script behave according to
whether it can find the various tools in your PATH, and it looks for many
different names for the same tool.
On Solaris...
Yuri Nesterenko wrote:
Colleagues,
moderately useful dry-run finding:
using kdiff3 as a merge tool for mercurial, you better wrap it in the script
like this ("merge = ~/bin/kdiff3.sh" in my .hgrc):
#!/bin/bash
/opt/kde3/bin/kdiff3 -o $1 $2 $1 $3
I like kdiff3 too, but doesn't work under de
Colleagues,
moderately useful dry-run finding:
using kdiff3 as a merge tool for mercurial, you better wrap it in the script
like this ("merge = ~/bin/kdiff3.sh" in my .hgrc):
#!/bin/bash
/opt/kde3/bin/kdiff3 -o $1 $2 $1 $3
This way, it will take common base of two revisions as a base
(which is
