components/mercurial/patches/extdiff.patch
author pkidd <patrick.kidd@oracle.com>
Wed, 09 Nov 2016 09:18:21 -0800
branchs11u3-sru14-backport
changeset 7283 645e6b8527b6
parent 5721 153e2c170241
permissions -rw-r--r--
Added tag S11.3SRU14.6, 0.175.3.14.0.6.0 for changeset eaaa4b66f543

Use GNU diff instead of Solaris diff.

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

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

diff --git a/hgext/extdiff.py b/hgext/extdiff.py
--- a/hgext/extdiff.py
+++ b/hgext/extdiff.py
@@ -282,7 +282,7 @@ def extdiff(ui, repo, *pats, **opts):
     program = opts.get('program')
     option = opts.get('option')
     if not program:
-        program = 'diff'
+        program = 'gdiff'
         option = option or ['-Npru']
     cmdline = ' '.join(map(util.shellquote, [program] + option))
     return dodiff(ui, repo, cmdline, pats, opts)