##// END OF EJS Templates
extdiff: fix defaulting to "diff" if no --program is given
Peter Arrenbrecht -
r9519:0d3c1aa9 default
parent child Browse files
Show More
@@ -173,11 +173,11 b' def extdiff(ui, repo, *pats, **opts):'
173 that revision is compared to the working directory, and, when no
173 that revision is compared to the working directory, and, when no
174 revisions are specified, the working directory files are compared
174 revisions are specified, the working directory files are compared
175 to its parent.'''
175 to its parent.'''
176 program = opts['program'] or 'diff'
176 program = opts.get('program')
177 if opts['program']:
177 option = opts.get('option')
178 option = opts['option']
178 if not program:
179 else:
179 program = 'diff'
180 option = opts['option'] or ['-Npru']
180 option = option or ['-Npru']
181 return dodiff(ui, repo, program, option, pats, opts)
181 return dodiff(ui, repo, program, option, pats, opts)
182
182
183 cmdtable = {
183 cmdtable = {
General Comments 0
You need to be logged in to leave comments. Login now