equal
deleted
inserted
replaced
305 U file |
305 U file |
306 $ hg revert -r 'p1()' file |
306 $ hg revert -r 'p1()' file |
307 $ hg resolve --mark file |
307 $ hg resolve --mark file |
308 (no more unresolved files) |
308 (no more unresolved files) |
309 $ hg histedit --continue |
309 $ hg histedit --continue |
|
310 251d831eeec5: empty changeset |
310 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
311 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
311 saved backup bundle to $TESTTMP/*-backup.hg (glob) |
312 saved backup bundle to $TESTTMP/*-backup.hg (glob) |
312 $ hg logt --graph |
313 $ hg logt --graph |
313 @ 1:617f94f13c0f +4 |
314 @ 1:617f94f13c0f +4 |
314 | |
315 | |