##// END OF EJS Templates
status: advertise --abort instead of 'update -C .' to abort graft...
Pulkit Goyal -
r39002:5b04b620 default
parent child Browse files
Show More
@@ -613,7 +613,7 b' def _updatecleanmsg(dest=None):'
613
613
614 def _graftmsg():
614 def _graftmsg():
615 # tweakdefaults requires `update` to have a rev hence the `.`
615 # tweakdefaults requires `update` to have a rev hence the `.`
616 return _helpmessage('hg graft --continue', _updatecleanmsg())
616 return _helpmessage('hg graft --continue', 'hg graft --abort')
617
617
618 def _mergemsg():
618 def _mergemsg():
619 # tweakdefaults requires `update` to have a rev hence the `.`
619 # tweakdefaults requires `update` to have a rev hence the `.`
@@ -237,7 +237,7 b' Using status to get more context'
237 # To mark files as resolved: hg resolve --mark FILE
237 # To mark files as resolved: hg resolve --mark FILE
238
238
239 # To continue: hg graft --continue
239 # To continue: hg graft --continue
240 # To abort: hg update --clean . (warning: this will discard uncommitted changes)
240 # To abort: hg graft --abort
241
241
242
242
243 Commit while interrupted should fail:
243 Commit while interrupted should fail:
General Comments 0
You need to be logged in to leave comments. Login now