24 from mercurial import (

    24 from mercurial import (

    25     encoding,

    25     encoding,

    26     error,

    26     error,

    27     fancyopts,

    27     fancyopts,

    28     registrar,

    28     registrar,

    30 )

    32 )

    31 

    33 

    32 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for

    34 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for

    33 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should

    35 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should

    34 # be specifying the version(s) of Mercurial they are tested with, or

    36 # be specifying the version(s) of Mercurial they are tested with, or

   623                   "--stage\n"))

   625                   "--stage\n"))

   624     if opts.get('_zero'):

   626     if opts.get('_zero'):

   625         cmd['-0'] = None

   627         cmd['-0'] = None

   626     cmd.append('.')

   628     cmd.append('.')

   627     for include in args:

   629     for include in args:

   629 

   631 

   630     ui.status((bytes(cmd)), "\n")

   632     ui.status((bytes(cmd)), "\n")

   631 

   633 

   632 def merge(ui, repo, *args, **kwargs):

   634 def merge(ui, repo, *args, **kwargs):

   633     cmdoptions = [

   635     cmdoptions = [