diff doc/hgmerge.1.txt @ 1456:214f42f23a3b

Remove copy/rename --parents option This is no longer needed now that we have more standard UNIX-like copy semantics.
author Matt Mackall <mpm@selenic.com>
date Wed, 26 Oct 2005 16:32:50 -0700
parents 3ab6e55ee361
children
line wrap: on
line diff