Mercurial > hg
diff tests/test-issue612.out @ 6512:368a4ec603cc
merge: introduce mergestate
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 10 Apr 2008 15:02:24 -0500 |
| parents | 4b0c9c674707 |
| children |
line wrap: on
line diff
--- a/tests/test-issue612.out Thu Apr 10 14:25:50 2008 +0200 +++ b/tests/test-issue612.out Thu Apr 10 15:02:24 2008 -0500 @@ -3,7 +3,7 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head ? src/a.o -merging src/a.c and source/a.c +merging src/a.c and source/a.c to source/a.c 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M source/a.c