Mercurial > hg
view tests/test-conflict.out @ 1249:a5355fa5e33a
Fix up copy command to behave more like regular "cp".
In addition to recording changes, copy now updates the working
directory.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 14 Sep 2005 14:29:02 -0700 |
parents | 5a034646e472 |
children | 7544700fd931 |
line wrap: on
line source
merge: warning: conflicts during merge merging a merging a failed! 32e80765d7fe+75234512624c+ tip something else ======= something M a