Mercurial > hg-stable
diff tests/test-graft.t @ 38320:47f5454a30ed
cmdutil: say that `graft --stop` stops the graft instead of aborting
I am going to add a --abort flag to graft soon, so we make sure we differentiate
between the what --stop flag does and what --abort does and don't use the words
interchangeably.
Differential Revision: https://phab.mercurial-scm.org/D3735
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 15 Jun 2018 02:07:39 +0530 |
parents | 2ec44160165d |
children | 50f5fc232c16 |
line wrap: on
line diff
--- a/tests/test-graft.t Thu Jun 14 16:51:39 2018 -0400 +++ b/tests/test-graft.t Fri Jun 15 02:07:39 2018 +0530 @@ -244,7 +244,7 @@ $ hg ci -m 'commit interrupted graft' abort: graft in progress - (use 'hg graft --continue' or 'hg graft --stop' to abort) + (use 'hg graft --continue' or 'hg graft --stop' to stop) [255] Abort the graft and try committing: