equal
deleted
inserted
replaced
315 $ hg resolve --mark file |
315 $ hg resolve --mark file |
316 (no more unresolved files) |
316 (no more unresolved files) |
317 continue: hg histedit --continue |
317 continue: hg histedit --continue |
318 $ hg histedit --continue |
318 $ hg histedit --continue |
319 251d831eeec5: empty changeset |
319 251d831eeec5: empty changeset |
320 saved backup bundle to $TESTTMP/fold-to-empty-test/.hg/strip-backup/888f9082bf99-daa0b8b3-histedit.hg (glob) |
320 saved backup bundle to $TESTTMP/fold-to-empty-test/.hg/strip-backup/888f9082bf99-daa0b8b3-histedit.hg |
321 $ hg logt --graph |
321 $ hg logt --graph |
322 @ 1:617f94f13c0f +4 |
322 @ 1:617f94f13c0f +4 |
323 | |
323 | |
324 o 0:0189ba417d34 1+2+3 |
324 o 0:0189ba417d34 1+2+3 |
325 |
325 |
392 HG: Leave message empty to abort commit. |
392 HG: Leave message empty to abort commit. |
393 HG: -- |
393 HG: -- |
394 HG: user: test |
394 HG: user: test |
395 HG: branch 'default' |
395 HG: branch 'default' |
396 HG: changed file |
396 HG: changed file |
397 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-3d69522c-histedit.hg (glob) |
397 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-3d69522c-histedit.hg |
398 $ hg logt -G |
398 $ hg logt -G |
399 @ 1:10c647b2cdd5 +4 |
399 @ 1:10c647b2cdd5 +4 |
400 | |
400 | |
401 o 0:0189ba417d34 1+2+3 |
401 o 0:0189ba417d34 1+2+3 |
402 |
402 |