Show More
@@ -3173,7 +3173,7 b' summaryremotehooks = util.hooks()' | |||||
3173 | # (state file, clearable, allowcommit, error, hint) |
|
3173 | # (state file, clearable, allowcommit, error, hint) | |
3174 | unfinishedstates = [ |
|
3174 | unfinishedstates = [ | |
3175 | ('graftstate', True, False, _('graft in progress'), |
|
3175 | ('graftstate', True, False, _('graft in progress'), | |
3176 |
_("use 'hg graft --continue' or 'hg graft --stop' to |
|
3176 | _("use 'hg graft --continue' or 'hg graft --stop' to stop")), | |
3177 | ('updatestate', True, False, _('last update was interrupted'), |
|
3177 | ('updatestate', True, False, _('last update was interrupted'), | |
3178 | _("use 'hg update' to get a consistent checkout")) |
|
3178 | _("use 'hg update' to get a consistent checkout")) | |
3179 | ] |
|
3179 | ] |
@@ -244,7 +244,7 b' Commit while interrupted should fail:' | |||||
244 |
|
244 | |||
245 | $ hg ci -m 'commit interrupted graft' |
|
245 | $ hg ci -m 'commit interrupted graft' | |
246 | abort: graft in progress |
|
246 | abort: graft in progress | |
247 |
(use 'hg graft --continue' or 'hg graft --stop' to |
|
247 | (use 'hg graft --continue' or 'hg graft --stop' to stop) | |
248 | [255] |
|
248 | [255] | |
249 |
|
249 | |||
250 | Abort the graft and try committing: |
|
250 | Abort the graft and try committing: |
General Comments 0
You need to be logged in to leave comments.
Login now