comparison doc/hgmerge.1.txt @ 3748:7b88bd88f040

Fix test-rename-dir-merge for different implementations of ls.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Dec 2006 15:40:23 +0100
parents 345bac2bc4ec
children 63b9d2deed48
comparison
equal deleted inserted replaced
3747:b5c4d749f37f 3748:7b88bd88f040