diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2012-01-03 16:06:58 +0000 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2012-01-03 16:06:58 +0000 |
| commit | 04254fa903701943bd45a479a952cc213a5b112a (patch) | |
| tree | 5ae865f0cae8505cb54d3360baa256fc684e3bbc /ui-diff.c | |
| parent | shared.c: Only setenv() if value is non-null (diff) | |
| parent | Fix diff mode switching when side-by-side-diffs=1 (diff) | |
| download | cgit-pink-04254fa903701943bd45a479a952cc213a5b112a.tar.gz cgit-pink-04254fa903701943bd45a479a952cc213a5b112a.zip | |
Merge branch 'stable'
Diffstat (limited to '')
| -rw-r--r-- | ui-diff.c | 3 |
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(); |