Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge1.out @ 3407:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -0500 |
parents | f472cf9a71af |
children | 3109f012c305 |
line wrap: on
line diff
--- a/tests/test-merge1.out +++ b/tests/test-merge1.out @@ -1,6 +1,6 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% no merges expected -0 files updated, 1 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff -r d9e5953b9dec b --- /dev/null @@ -29,7 +29,7 @@ This is file b1 %% merge fails abort: outstanding uncommitted changes %% merge expected! -0 files updated, 1 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff -r c1dd73cbf59f b --- a/b