diff doc/hgmerge.1.txt @ 2749:d13e4ffaa79d

[darcs2hg] Windows compatibilty patct Originally submitted by Daiju Kito 1. single quote didn't work in several cases 2. os.unlink tries to delete tmpfile when it's called. It won't wait like unix.
author Sébastien Pierre <sebastien@xprima.com>
date Tue, 01 Aug 2006 09:51:36 -0400
parents 3ab6e55ee361
children 345bac2bc4ec
line wrap: on
line diff