equal
deleted
inserted
replaced
215 ? file.orig |
215 ? file.orig |
216 $ hg resolve -l |
216 $ hg resolve -l |
217 U file |
217 U file |
218 $ hg revert -r 'p1()' file |
218 $ hg revert -r 'p1()' file |
219 $ hg resolve --mark file |
219 $ hg resolve --mark file |
220 no unresolved files; you may continue your unfinished operation |
220 no more unresolved files |
221 $ hg histedit --continue |
221 $ hg histedit --continue |
222 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
222 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
223 saved backup bundle to $TESTTMP/*-backup.hg (glob) |
223 saved backup bundle to $TESTTMP/*-backup.hg (glob) |
224 $ hg logt --graph |
224 $ hg logt --graph |
225 @ 1:617f94f13c0f +4 |
225 @ 1:617f94f13c0f +4 |
275 > 3 |
275 > 3 |
276 > 4 |
276 > 4 |
277 > 5 |
277 > 5 |
278 > EOF |
278 > EOF |
279 $ hg resolve --mark file |
279 $ hg resolve --mark file |
280 no unresolved files; you may continue your unfinished operation |
280 no more unresolved files |
281 $ hg commit -m '+5.2' |
281 $ hg commit -m '+5.2' |
282 created new head |
282 created new head |
283 $ echo 6 >> file |
283 $ echo 6 >> file |
284 $ HGEDITOR=cat hg histedit --continue |
284 $ HGEDITOR=cat hg histedit --continue |
285 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
285 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |