From bbf15c1d1daebcb0bd802e53212d9058ff4c2632 Mon Sep 17 00:00:00 2001
From: Andre D <Andre@andred.ca>
Date: Thu, 3 Apr 2014 13:46:13 -0400
Subject: [PATCH] wiki: Only show 3 lines of diff context.

---
 r2/r2/lib/merge.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/r2/r2/lib/merge.py b/r2/r2/lib/merge.py
index d0f73f525..3356c159c 100644
--- a/r2/r2/lib/merge.py
+++ b/r2/r2/lib/merge.py
@@ -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