equal
deleted
inserted
replaced
35 added 1 changesets with 1 changes to 1 files (+1 heads) |
35 added 1 changesets with 1 changes to 1 files (+1 heads) |
36 new changesets cc7000b01af9 |
36 new changesets cc7000b01af9 |
37 (run 'hg heads' to see heads, 'hg merge' to merge) |
37 (run 'hg heads' to see heads, 'hg merge' to merge) |
38 $ hg up -C 2 |
38 $ hg up -C 2 |
39 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
40 $ hg merge |
40 Abuse this test for also testing that merge respects ui.relative-paths |
41 merging testdir/subdir/a and testdir/a to testdir/subdir/a |
41 $ hg --cwd testdir merge --config ui.relative-paths=yes |
|
42 merging subdir/a and a to subdir/a |
42 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
43 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
43 (branch merge, don't forget to commit) |
44 (branch merge, don't forget to commit) |
44 $ hg stat |
45 $ hg stat |
45 M testdir/subdir/a |
46 M testdir/subdir/a |
46 $ hg diff --nodates |
47 $ hg diff --nodates |