equal
deleted
inserted
replaced
126 $ hg resolve -m |
126 $ hg resolve -m |
127 (no more unresolved files) |
127 (no more unresolved files) |
128 continue: hg evolve --continue |
128 continue: hg evolve --continue |
129 $ hg diff |
129 $ hg diff |
130 |
130 |
131 XXX: maybe we should add a message here about evolve resulting in no commit |
|
132 $ hg evolve --continue |
131 $ hg evolve --continue |
133 evolving 7:ad0a59d83efe "added e" |
132 evolving 7:ad0a59d83efe "added e" |
|
133 evolution of 7:ad0a59d83efe created no changes to commit |
134 |
134 |
135 $ hg glog |
135 $ hg glog |
136 @ 8:00a5c774cc37 added d |
136 @ 8:00a5c774cc37 added d |
137 | () draft |
137 | () draft |
138 o 5:cb6a2ab625bb added c |
138 o 5:cb6a2ab625bb added c |