From 6f92f332e6a9ee3e16051bda9fe148607af67f65 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 22 Jun 2010 14:16:12 +0000
Subject: Merge branch 'jh/context-lines'

Conflicts:
	cgit.c
	cgit.h
---
(limited to 'cgit.c')

diff --git a/cgit.c b/cgit.c
index d4fcfa7..ab25b6a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -258,6 +258,8 @@ static void querystring_cb(const char *name, const char *value)
 		ctx.qry.ssdiff = atoi(value);
 	} else if (!strcmp(name, "all")) {
 		ctx.qry.show_all = atoi(value);
+	} else if (!strcmp(name, "context")) {
+		ctx.qry.context = atoi(value);
 	}
 }
 
--
cgit v0.9.0.2