equal
deleted
inserted
replaced
279 # |
279 # |
280 # To mark files as resolved: hg resolve --mark FILE |
280 # To mark files as resolved: hg resolve --mark FILE |
281 |
281 |
282 # To continue: hg graft --continue |
282 # To continue: hg graft --continue |
283 # To abort: hg graft --abort |
283 # To abort: hg graft --abort |
|
284 # To stop: hg graft --stop |
284 |
285 |
285 |
286 |
286 Commit while interrupted should fail: |
287 Commit while interrupted should fail: |
287 |
288 |
288 $ hg ci -m 'commit interrupted graft' |
289 $ hg ci -m 'commit interrupted graft' |