1 Use GNU diff instead of Solaris diff.

     2 

     3 Solaris diff doesn't understand the -N option, which is part of the default

     4 option set.

     5 

     6 This is a very Solaris-specific patch, and should not be passed upstream.

     7 

     8 diff --git a/hgext/extdiff.py b/hgext/extdiff.py

     9 --- a/hgext/extdiff.py

    10 +++ b/hgext/extdiff.py

    11 @@ -282,7 +282,7 @@ def extdiff(ui, repo, *pats, **opts):

    12      program = opts.get('program')

    13      option = opts.get('option')

    14      if not program:

    15 -        program = 'diff'

    16 +        program = 'gdiff'

    17          option = option or ['-Npru']

    18      cmdline = ' '.join(map(util.shellquote, [program] + option))

    19      return dodiff(ui, repo, cmdline, pats, opts)