diff options
Diffstat (limited to 'tests/test-issue612.t')
| -rw-r--r-- | tests/test-issue612.t | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-issue612.t b/tests/test-issue612.t index 2985abb..67df561 100644 --- a/tests/test-issue612.t +++ b/tests/test-issue612.t @@ -7,7 +7,7 @@ http://mercurial.selenic.com/bts/issue612 adding src/a.c $ hg mv src source - moving src/a.c to source/a.c (glob) + moving src/a.c to source/a.c $ hg ci -Ammove @@ -24,11 +24,11 @@ http://mercurial.selenic.com/bts/issue612 $ hg merge merging src/a.c and source/a.c to source/a.c - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved + 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg status M source/a.c R src/a.c - ? src/a.o + ? source/a.o |