equal
deleted
inserted
replaced
136 $ rm A.orig |
136 $ rm A.orig |
137 $ hg resolve -m A |
137 $ hg resolve -m A |
138 (no more unresolved files) |
138 (no more unresolved files) |
139 $ hg rebase --continue |
139 $ hg rebase --continue |
140 rebasing 5:01e6ebbd8272 "F" (tip) |
140 rebasing 5:01e6ebbd8272 "F" (tip) |
141 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-backup.hg (glob) |
141 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob) |
142 |
142 |
143 $ hg tglog |
143 $ hg tglog |
144 @ 5:draft 'F' notdefault |
144 @ 5:draft 'F' notdefault |
145 | |
145 | |
146 o 4:draft 'E' |
146 o 4:draft 'E' |