| changeset 26614 | ef1eb6df7071 |
| parent 26352 | e635bc9bb7d9 |
| child 26618 | 8e6d5b7317e6 |
| 26613:abb5ec3eb6ce | 26614:ef1eb6df7071 |
|---|---|
81 [255] |
81 [255] |
82 |
82 |
83 resolve all |
83 resolve all |
84 $ hg resolve -a |
84 $ hg resolve -a |
85 merging bar |
85 merging bar |
86 warning: conflicts during merge. |
86 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') |
87 merging bar incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
88 [1] |
87 [1] |
89 |
88 |
90 after |
89 after |
91 $ hg resolve -l |
90 $ hg resolve -l |
92 U bar |
91 U bar |