log easyhg-merge.sh @ 278:f7cdd5b31aed new-branches

age author description
Thu, 20 Jan 2011 13:37:00 +0000 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