| changeset 15501 | 2371f4aea665 |
| parent 12346 | 3b165c127690 |
| child 16913 | f2719b387380 |
| 15500:d5abe76da61e | 15501:2371f4aea665 |
|---|---|
81 |
81 |
82 resolve all |
82 resolve all |
83 $ hg resolve -a |
83 $ hg resolve -a |
84 merging bar |
84 merging bar |
85 warning: conflicts during merge. |
85 warning: conflicts during merge. |
86 merging bar failed! |
86 merging bar incomplete! (edit conflicts, then use 'hg resolve --mark') |
87 [1] |
87 [1] |
88 |
88 |
89 after |
89 after |
90 $ hg resolve -l |
90 $ hg resolve -l |
91 U bar |
91 U bar |