Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 955:307ca8ca234f
Remove -C alias for --cwd
author | mpm@selenic.com |
---|---|
date | Fri, 19 Aug 2005 16:51:44 -0800 |
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