Mercurial > hg
diff tests/test-merge1.out @ 3311:966632304dde
merge: shortcircuit filemerge for identical files
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 10 Oct 2006 01:16:06 -0500 |
| parents | a31557193f3c |
| children | f472cf9a71af |
line wrap: on
line diff
--- a/tests/test-merge1.out Tue Oct 10 01:13:03 2006 -0500 +++ b/tests/test-merge1.out Tue Oct 10 01:16:06 2006 -0500 @@ -1,7 +1,5 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% no merges expected -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 @@ -19,8 +17,6 @@ %% merge fails abort: outstanding uncommitted changes %% merge expected! -merging for b -merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved