equal
deleted
inserted
replaced
303 $ hg resolve --mark file |
303 $ hg resolve --mark file |
304 (no more unresolved files) |
304 (no more unresolved files) |
305 continue: hg histedit --continue |
305 continue: hg histedit --continue |
306 $ hg histedit --continue |
306 $ hg histedit --continue |
307 251d831eeec5: empty changeset |
307 251d831eeec5: empty changeset |
308 saved backup bundle to $TESTTMP/*-backup.hg (glob) |
308 saved backup bundle to $TESTTMP/fold-to-empty-test/.hg/strip-backup/888f9082bf99-daa0b8b3-histedit.hg (glob) |
309 $ hg logt --graph |
309 $ hg logt --graph |
310 @ 1:617f94f13c0f +4 |
310 @ 1:617f94f13c0f +4 |
311 | |
311 | |
312 o 0:0189ba417d34 1+2+3 |
312 o 0:0189ba417d34 1+2+3 |
313 |
313 |
380 HG: Leave message empty to abort commit. |
380 HG: Leave message empty to abort commit. |
381 HG: -- |
381 HG: -- |
382 HG: user: test |
382 HG: user: test |
383 HG: branch 'default' |
383 HG: branch 'default' |
384 HG: changed file |
384 HG: changed file |
385 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-3d69522c-backup.hg (glob) |
385 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-3d69522c-histedit.hg (glob) |
386 $ hg logt -G |
386 $ hg logt -G |
387 @ 1:10c647b2cdd5 +4 |
387 @ 1:10c647b2cdd5 +4 |
388 | |
388 | |
389 o 0:0189ba417d34 1+2+3 |
389 o 0:0189ba417d34 1+2+3 |
390 |
390 |