equal
deleted
inserted
replaced
36 updating: foo 1/1 files (100.00%) |
36 updating: foo 1/1 files (100.00%) |
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
38 (branch merge, don't forget to commit) |
38 (branch merge, don't forget to commit) |
39 |
39 |
40 $ hg debugstate | grep foo |
40 $ hg debugstate | grep foo |
41 n 0 -2 unset foo |
41 m 0 -2 unset foo |
42 |
42 |
43 $ hg st -A foo |
43 $ hg st -A foo |
44 M foo |
44 M foo |
45 |
45 |
46 $ hg ci -m 'merge' |
46 $ hg ci -m 'merge' |