Changeset 29f03b0cab67…
Parent 944b5a53b1e3…
by
Changes to one file · Browse files at 29f03b0cab67 Showing diff from parent 944b5a53b1e3 Diff from another changeset...
@@ -197,6 +197,7 @@ path = cmd
diffopts = self.ui.config('extdiff', 'opts.' + cmd, '')
diffopts = diffopts and [diffopts] or []
+ return path, diffopts
elif cmd == usercmd:
# command = path opts
if path:
@@ -204,7 +205,7 @@ path = diffopts.pop(0)
else:
path, diffopts = cmd, []
- return path, diffopts
+ return path, diffopts
return None, None
def _parse_config(self):
|
Loading...