equal
deleted
inserted
replaced
214 When two revision arguments are given, then changes are shown |
214 When two revision arguments are given, then changes are shown |
215 between those revisions. If only one revision is specified then |
215 between those revisions. If only one revision is specified then |
216 that revision is compared to the working directory, and, when no |
216 that revision is compared to the working directory, and, when no |
217 revisions are specified, the working directory files are compared |
217 revisions are specified, the working directory files are compared |
218 to its parent.''' |
218 to its parent.''' |
219 program = opts['program'] or 'diff' |
219 program = opts.get('program') |
220 if opts['program']: |
220 option = opts.get('option') |
221 option = opts['option'] |
221 if not program: |
222 else: |
222 program = 'diff' |
223 option = opts['option'] or ['-Npru'] |
223 option = option or ['-Npru'] |
224 return dodiff(ui, repo, program, option, pats, opts) |
224 return dodiff(ui, repo, program, option, pats, opts) |
225 |
225 |
226 cmdtable = { |
226 cmdtable = { |
227 "extdiff": |
227 "extdiff": |
228 (extdiff, |
228 (extdiff, |