equal
deleted
inserted
replaced
116 $ hg resolve -m |
116 $ hg resolve -m |
117 (no more unresolved files) |
117 (no more unresolved files) |
118 continue: hg evolve --continue |
118 continue: hg evolve --continue |
119 $ hg evolve -c |
119 $ hg evolve -c |
120 evolving 2:13833940840c "c" |
120 evolving 2:13833940840c "c" |
|
121 working directory is now at 3d2080c198e5 |
121 |
122 |
122 $ hg glog |
123 $ hg glog |
123 @ 4 - 3d2080c198e5 c (secret) |
124 @ 4 - 3d2080c198e5 c (secret) |
124 | |
125 | |
125 o 3 - 87495ea7c9ec b (draft) |
126 o 3 - 87495ea7c9ec b (draft) |