equal
deleted
inserted
replaced
237 |
237 |
238 def uisetup(ui): |
238 def uisetup(ui): |
239 for cmd, path in ui.configitems('extdiff'): |
239 for cmd, path in ui.configitems('extdiff'): |
240 if cmd.startswith('cmd.'): |
240 if cmd.startswith('cmd.'): |
241 cmd = cmd[4:] |
241 cmd = cmd[4:] |
242 if not path: path = cmd |
242 if not path: |
|
243 path = cmd |
243 diffopts = ui.config('extdiff', 'opts.' + cmd, '') |
244 diffopts = ui.config('extdiff', 'opts.' + cmd, '') |
244 diffopts = diffopts and [diffopts] or [] |
245 diffopts = diffopts and [diffopts] or [] |
245 elif cmd.startswith('opts.'): |
246 elif cmd.startswith('opts.'): |
246 continue |
247 continue |
247 else: |
248 else: |