aboutsummaryrefslogtreecommitdiff
path: root/ui-diff.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2012-01-03 16:06:58 +0000
committerLars Hjemli <hjemli@gmail.com>2012-01-03 16:06:58 +0000
commit04254fa903701943bd45a479a952cc213a5b112a (patch)
tree5ae865f0cae8505cb54d3360baa256fc684e3bbc /ui-diff.c
parentd96d2c98ebc4c2d3765f5b35c4142e0e828a421b (diff)
parentf2ced535e9f2c2ada7f184735a07a1190a9d810f (diff)
downloadcgit-04254fa903701943bd45a479a952cc213a5b112a.tar.gz
cgit-04254fa903701943bd45a479a952cc213a5b112a.tar.bz2
cgit-04254fa903701943bd45a479a952cc213a5b112a.zip
Merge branch 'stable'
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui-diff.c b/ui-diff.c
index d97a801..af24a6c 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -395,8 +395,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
}
}
- if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
- use_ssdiff = 1;
+ use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
if (show_ctrls)
cgit_print_diff_ctrls();