mirror/zx2c4.cgit
1
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2025-07-15 12:44:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'stable'

Browse source
This commit is contained in:
Lars Hjemli 2012-01-03 16:06:58 +00:00
commit 04254fa903
9 changed files with 68 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ui-diff.c
View file

@ -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();