Show More
@@ -1564,6 +1564,8 def diffopts(ui, opts=None, untrusted=Fa | |||||
1564 | v = opts.get(key) |
|
1564 | v = opts.get(key) | |
1565 | if v: |
|
1565 | if v: | |
1566 | return v |
|
1566 | return v | |
|
1567 | if forceplain is not None and ui.plain(): | |||
|
1568 | return forceplain | |||
1567 | return getter(section, name or key, None, untrusted=untrusted) |
|
1569 | return getter(section, name or key, None, untrusted=untrusted) | |
1568 |
|
1570 | |||
1569 | return mdiff.diffopts( |
|
1571 | return mdiff.diffopts( |
General Comments 0
You need to be logged in to leave comments.
Login now