| branch | stable |
| changeset 21947 | b081decd9062 |
| parent 21267 | e4f451c8c05c |
| child 23917 | 3cbb5bf4035d |
| 21946:868e2cea3ea0 | 21947:b081decd9062 |
|---|---|
39 [255] |
39 [255] |
40 |
40 |
41 Mark the conflict as resolved and commit |
41 Mark the conflict as resolved and commit |
42 |
42 |
43 $ hg resolve -m A |
43 $ hg resolve -m A |
44 no more unresolved files |
44 (no more unresolved files) |
45 $ hg commit -m "Merged" |
45 $ hg commit -m "Merged" |
46 |
46 |
47 $ cd .. |
47 $ cd .. |