equal
deleted
inserted
replaced
103 adding r6 |
103 adding r6 |
104 |
104 |
105 $ hg up -q qtip |
105 $ hg up -q qtip |
106 |
106 |
107 $ HGMERGE=internal:fail hg rebase |
107 $ HGMERGE=internal:fail hg rebase |
108 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue |
108 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
109 [255] |
109 [255] |
110 |
110 |
111 $ HGMERGE=internal:local hg resolve --all |
111 $ HGMERGE=internal:local hg resolve --all |
112 |
112 |
113 $ hg rebase --continue |
113 $ hg rebase --continue |