From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 3 Jan 2012 16:06:58 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/04254fa903701943bd45a479a952cc213a5b112a

Merge branch 'stable'
---

04254fa903701943bd45a479a952cc213a5b112a
diff --cc ui-diff.c
index d97a801,f8782df..af24a6c
--- a/ui-diff.c
+++ b/ui-diff.c
@@@ -395,12 -372,9 +395,11 @@@ void cgit_print_diff(const char *new_re
  		}
  	}
  
- 	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;
  
 -	print_ssdiff_link();
 +	if (show_ctrls)
 +		cgit_print_diff_ctrls();
 +
  	cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
  
  	if (use_ssdiff) {