Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge1.out @ 3002:a31557193f3c
merge: simplify working dir manifest generation
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 22 Aug 2006 17:08:38 -0500 |
parents | b2ae81a7df29 |
children | 966632304dde 49966b5ab16f |
line wrap: on
line diff
--- a/tests/test-merge1.out +++ b/tests/test-merge1.out @@ -1,6 +1,8 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% no merges expected -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +merging for b +merging b +0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% merge should fail