equal
deleted
inserted
replaced
70 $ hg graft 1 |
70 $ hg graft 1 |
71 grafting 1:5974126fad84 "b1" |
71 grafting 1:5974126fad84 "b1" |
72 merging b |
72 merging b |
73 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
73 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
74 abort: unresolved conflicts, can't continue |
74 abort: unresolved conflicts, can't continue |
75 (use hg resolve and hg graft --continue) |
75 (use 'hg resolve' and 'hg graft --continue') |
76 [255] |
76 [255] |
77 $ echo a > b |
77 $ echo a > b |
78 $ echo b3 >> b |
78 $ echo b3 >> b |
79 $ hg resolve --mark b |
79 $ hg resolve --mark b |
80 (no more unresolved files) |
80 (no more unresolved files) |