Mercurial > hg > gitweb
diff tests/test-rename-dir-merge2.out @ 4416:bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 08 May 2007 02:59:13 -0500 |
| parents | 4787e2b0dd03 |
| children |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge2.out Tue May 08 02:57:05 2007 -0500 +++ b/tests/test-rename-dir-merge2.out Tue May 08 02:59:13 2007 -0500 @@ -10,11 +10,9 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) -merging a/f and b/f -1 files updated, 1 files merged, 0 files removed, 0 files unresolved +2 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) M b/f - a/f A b/aa/g a/aa/g R a/aa/g