branch | stable |
changeset 19476 | 4fed15d4c5aa |
parent 19332 | 0af993732f66 |
child 19804 | 061ce98c888d |
--- a/tests/test-graft.t Wed Jul 24 23:30:24 2013 -0500 +++ b/tests/test-graft.t Wed Jul 24 23:51:40 2013 -0500 @@ -177,8 +177,8 @@ Commit while interrupted should fail: $ hg ci -m 'commit interrupted graft' - abort: cannot commit an interrupted graft operation - (use "hg graft -c" to continue graft) + abort: graft in progress + (use 'hg graft --continue' or 'hg update' to abort) [255] Abort the graft and try committing: