hgext/rebase.py
changeset 39095 571361e47137
parent 39094 2cf0b8b830ba
child 39097 c1a1fb389b4d
equal deleted inserted replaced
39094:2cf0b8b830ba 39095:571361e47137
   731     can specify one with ``--tool``, see :hg:`help merge-tools`.
   731     can specify one with ``--tool``, see :hg:`help merge-tools`.
   732     As a caveat: the tool will not be used to mediate when a file was
   732     As a caveat: the tool will not be used to mediate when a file was
   733     deleted, there is no hook presently available for this.
   733     deleted, there is no hook presently available for this.
   734 
   734 
   735     If a rebase is interrupted to manually resolve a conflict, it can be
   735     If a rebase is interrupted to manually resolve a conflict, it can be
   736     continued with --continue/-c or aborted with --abort/-a.
   736     continued with --continue/-c, aborted with --abort/-a, or stopped with
       
   737     --stop.
   737 
   738 
   738     .. container:: verbose
   739     .. container:: verbose
   739 
   740 
   740       Examples:
   741       Examples:
   741 
   742