Mercurial > hg
comparison tests/test-rebase-conflicts.t @ 27626:157675d0f600
rebase: hook afterresolvedstates
author | timeless <timeless@mozdev.org> |
---|---|
date | Thu, 24 Dec 2015 20:41:40 +0000 |
parents | 34bba01a1355 |
children | c3e9269d9602 |
comparison
equal
deleted
inserted
replaced
27625:cdb9493a7e2f | 27626:157675d0f600 |
---|---|
81 Conclude rebase: | 81 Conclude rebase: |
82 | 82 |
83 $ echo 'resolved merge' >common | 83 $ echo 'resolved merge' >common |
84 $ hg resolve -m common | 84 $ hg resolve -m common |
85 (no more unresolved files) | 85 (no more unresolved files) |
86 continue: hg rebase --continue | |
86 $ hg rebase --continue | 87 $ hg rebase --continue |
87 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb | 88 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
88 rebasing 4:46f0b057b5c0 "L2" | 89 rebasing 4:46f0b057b5c0 "L2" |
89 rebasing 5:8029388f38dc "L3" (mybook) | 90 rebasing 5:8029388f38dc "L3" (mybook) |
90 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-backup.hg (glob) | 91 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-backup.hg (glob) |