##// END OF EJS Templates
extdiff: use the default option only if the default program is used
TK Soh -
r3129:f145d048 default
parent child Browse files
Show More
@@ -137,8 +137,12 b' def extdiff(ui, repo, *pats, **opts):'
137 specified then that revision is compared to the working
137 specified then that revision is compared to the working
138 directory, and, when no revisions are specified, the
138 directory, and, when no revisions are specified, the
139 working directory files are compared to its parent.'''
139 working directory files are compared to its parent.'''
140 return dodiff(ui, repo, opts['program'] or 'diff',
140 program = opts['program'] or 'diff'
141 opts['option'] or ['-Npru'], pats, opts)
141 if opts['program']:
142 option = opts['option']
143 else:
144 option = opts['option'] or ['-Npru']
145 return dodiff(ui, repo, program, option, pats, opts)
142
146
143 cmdtable = {
147 cmdtable = {
144 "extdiff":
148 "extdiff":
General Comments 0
You need to be logged in to leave comments. Login now