Mercurial > hg
diff tests/test-merge10.out @ 6512:368a4ec603cc
merge: introduce mergestate
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 10 Apr 2008 15:02:24 -0500 |
| parents | 0750f11152fe |
| children | a3d73b3e1f8a |
line wrap: on
line diff
--- a/tests/test-merge10.out Thu Apr 10 14:25:50 2008 +0200 +++ b/tests/test-merge10.out Thu Apr 10 15:02:24 2008 -0500 @@ -8,7 +8,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -merging testdir/subdir/a and testdir/a +merging testdir/subdir/a and testdir/a to testdir/subdir/a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M testdir/subdir/a