427             args = ui.config('diff-tools', cmd+'.diffargs') or \

   427             args = ui.config('diff-tools', cmd+'.diffargs') or \

   428                    ui.config('merge-tools', cmd+'.diffargs')

   428                    ui.config('merge-tools', cmd+'.diffargs')

   429             if args:

   429             if args:

   430                 cmdline += ' ' + args

   430                 cmdline += ' ' + args

   431         command(cmd, extdiffopts[:], _('hg %s [OPTION]... [FILE]...') % cmd,

   431         command(cmd, extdiffopts[:], _('hg %s [OPTION]... [FILE]...') % cmd,

   432                 inferrepo=True)(savedcmd(path, cmdline))

   433                 inferrepo=True)(savedcmd(path, cmdline))

   433 

   434 

   434 # tell hggettext to extract docstrings from these functions:

   435 # tell hggettext to extract docstrings from these functions:

   435 i18nfunctions = [savedcmd]

   436 i18nfunctions = [savedcmd]