wiki: Only show 3 lines of diff context.

This commit is contained in:
Andre D
2014-04-03 13:46:13 -04:00
committed by Neil Williams
parent aefd1031a1
commit bbf15c1d1d

View File

@@ -40,7 +40,8 @@ def make_htmldiff(a, b, adesc, bdesc):
return diffcontent.make_table(a.splitlines(),
b.splitlines(),
fromdesc=adesc,
todesc=bdesc)
todesc=bdesc,
context=3)
def threewaymerge(original, a, b):
temp_dir = g.diff3_temp_location if g.diff3_temp_location else None