log hgmerge @ 795:cd0ad12d9e42

age author description
Fri, 29 Jul 2005 14:51:41 +0100 Thomas Arendsen Hein Remove usage of ${par:-word}, which and mktemp. Quote filenames.