equal
deleted
inserted
replaced
106 adding r6 |
106 adding r6 |
107 |
107 |
108 $ hg up -q qtip |
108 $ hg up -q qtip |
109 |
109 |
110 $ HGMERGE=internal:fail hg rebase |
110 $ HGMERGE=internal:fail hg rebase |
111 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
111 unresolved conflicts (see hg resolve, then hg rebase --continue) |
112 [255] |
112 [1] |
113 |
113 |
114 $ HGMERGE=internal:local hg resolve --all |
114 $ HGMERGE=internal:local hg resolve --all |
115 |
115 |
116 $ hg rebase --continue |
116 $ hg rebase --continue |
117 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) |
117 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) |