diff -r 70e62df12704 -r f145d04899d2 hgext/extdiff.py --- a/hgext/extdiff.py Mon Sep 18 11:55:38 2006 +0200 +++ b/hgext/extdiff.py Mon Sep 18 12:01:32 2006 +0200 @@ -137,8 +137,12 @@ specified then that revision is compared to the working directory, and, when no revisions are specified, the working directory files are compared to its parent.''' - return dodiff(ui, repo, opts['program'] or 'diff', - opts['option'] or ['-Npru'], pats, opts) + program = opts['program'] or 'diff' + if opts['program']: + option = opts['option'] + else: + option = opts['option'] or ['-Npru'] + return dodiff(ui, repo, program, option, pats, opts) cmdtable = { "extdiff":