diff doc/hgmerge.1.txt @ 1786:ffb584a182d1

Don't use mktemp in tests, we're already in a secure temp dir.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 22 Feb 2006 07:51:32 +0100
parents 3ab6e55ee361
children 345bac2bc4ec
line wrap: on
line diff