equal
deleted
inserted
replaced
181 (hg histedit --continue to resume) |
181 (hg histedit --continue to resume) |
182 $ echo b2 > B |
182 $ echo b2 > B |
183 $ hg resolve --mark B |
183 $ hg resolve --mark B |
184 (no more unresolved files) |
184 (no more unresolved files) |
185 continue: hg histedit --continue |
185 continue: hg histedit --continue |
186 $ hg histedit --continue | fixbundle |
186 $ hg continue | fixbundle |
187 $ hg tglog |
187 $ hg tglog |
188 @ 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X' |
188 @ 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X' |
189 | |
189 | |
190 o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
190 o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
191 | |
191 | |