Mercurial > hg
comparison tests/test-rebase-mq.out @ 11201:34023f2ca305
Fix up rebase's handling of strip backups
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 20 May 2010 12:21:35 -0500 |
parents | b345b1cc124f |
children | f974fe896921 |
comparison
equal
deleted
inserted
replaced
11200:12e5149cafca | 11201:34023f2ca305 |
---|---|
25 merging f failed! | 25 merging f failed! |
26 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | 26 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue |
27 merging f | 27 merging f |
28 | 28 |
29 % Fix the 2nd conflict | 29 % Fix the 2nd conflict |
30 saved backup bundle to | |
30 adding branch | 31 adding branch |
31 adding changesets | 32 adding changesets |
32 adding manifests | 33 adding manifests |
33 adding file changes | 34 adding file changes |
34 added 2 changesets with 2 changes to 1 files | 35 added 2 changesets with 2 changes to 1 files |