equal
deleted
inserted
replaced
77 |
77 |
78 $ echo 'resolved merge' >common |
78 $ echo 'resolved merge' >common |
79 $ hg resolve -m common |
79 $ hg resolve -m common |
80 (no more unresolved files) |
80 (no more unresolved files) |
81 $ hg rebase --continue |
81 $ hg rebase --continue |
82 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
82 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-backup.hg (glob) |
83 |
83 |
84 $ hg tglog |
84 $ hg tglog |
85 @ 5:secret 'L3' mybook |
85 @ 5:secret 'L3' mybook |
86 | |
86 | |
87 o 4:secret 'L2' |
87 o 4:secret 'L2' |