kdiff3 arguments order

Yuri Nesterenko Yuri.Nesterenko at Sun.COM
Fri Nov 30 14:07:28 UTC 2007


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):

/opt/kde3/bin/kdiff3 -o $1 $2 $1 $3 

This way, it will take common base of two revisions as a base 
(which is correct), will correctly merge different lines,
and will save the result in the right place.


More information about the build-dev mailing list