equal
deleted
inserted
replaced
12 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
12 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
13 |
13 |
14 $ hg mv a a2 |
14 $ hg mv a a2 |
15 $ hg up |
15 $ hg up |
16 note: possible conflict - a was renamed multiple times to: |
16 note: possible conflict - a was renamed multiple times to: |
|
17 a1 |
17 a2 |
18 a2 |
18 a1 |
|
19 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
19 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
20 |
20 |
21 $ hg ci -m2 |
21 $ hg ci -m2 |
22 |
22 |
23 $ touch a |
23 $ touch a |