log easyhg-merge.sh @ 269:f6b71fda5957

age author description
2011-01-20 Chris Cannam * Rename the -osx.sh files to plain .sh, since we could use them elsewhere too. Rely on bundled kdiff3 if it exists. base easyhg-merge-osx.sh@483db46bf40e