annotate tests/test-merge4.out @ 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 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source