ray cdfe458118 Use /usr/local/bin/g{co,merge} and /usr/bin/diff{,3} instead of the ... (possibly nonexistent) /usr/local/bin/{co,merge,diff,diff3} programs. OK jolan@ and pval@.		2006-09-25 23:23:10 +00:00
..
patch-src_conf_sh