aboutsummaryrefslogtreecommitdiff
path: root/ui-diff.c
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui-diff.c b/ui-diff.c
index af24a6c..d97a801 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -395,7 +395,8 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
}
}
- use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
+ if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
+ use_ssdiff = 1;
if (show_ctrls)
cgit_print_diff_ctrls();