Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-dir-merge2.out @ 4312:5e05007d3857
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Apr 2007 17:09:31 -0500 |
parents | 4787e2b0dd03 |
children | bb1800a7d7e1 |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge2.out +++ b/tests/test-rename-dir-merge2.out @@ -10,9 +10,11 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) -2 files updated, 0 files merged, 1 files removed, 0 files unresolved +merging a/f and b/f +1 files updated, 1 files merged, 0 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