Mercurial > hg
view tests/test-rebase-check-restore.out @ 11208:2313dc4d9817
tests: fix bashism to load helpers.sh
`source` isn't available at POSIX sh.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Fri, 21 May 2010 20:55:18 +0900 |
parents | 7a9cf012dddc |
children |
line wrap: on
line source
% - Rebasing B onto E - check keep @ 5:F:notdefault | | o 4:E: | | | o 3:D: |/ | o 2:C: | | | o 1:B: |/ o 0:A: warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue merging A % - Solve the conflict and go on @ 7:C: | o 6:B: | | o 5:F:notdefault | | o | 4:E: | | o | 3:D: |/ | o 2:C: | | | o 1:B: |/ o 0:A: % - Rebase F onto E - check keepbranches @ 5:F:notdefault | | o 4:E: | | | o 3:D: |/ | o 2:C: | | | o 1:B: |/ o 0:A: warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue merging A % - Solve the conflict and go on saved backup bundle to @ 5:F:notdefault | o 4:E: | o 3:D: | | o 2:C: | | | o 1:B: |/ o 0:A: