Merge branch 'stable'

2012-01-03 16:06:58 +00:00
parent d96d2c98eb f2ced535e9
commit 04254fa903
9 changed files with 68 additions and 17 deletions
--- 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();