Mercurial > hg
diff tests/test-rename-dir-merge2.out @ 4417:0912d8df5e19
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 May 2007 11:42:48 -0500 |
parents | bb1800a7d7e1 |
children | 2493a478f395 |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge2.out Sat May 05 15:56:49 2007 +0900 +++ b/tests/test-rename-dir-merge2.out Tue May 08 11:42:48 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