Merge branch 'jh/context-lines'

Conflicts:
	cgit.c
	cgit.h

diff --cc cgit.c
index d4fcfa70b18952e72bf4bde7b1050cc148db5188,e9bafb506ef38c24c4b4300de08d0b5965a738f6..ab25b6a00efe4889863b7625c22e9ea180d0fe61
--- 1/cgit.c
--- 2/cgit.c
+++ b/cgit.c
@@@ -256,8 -250,8 +256,10 @@@ static void querystring_cb(const char *
                ctx.qry.period = xstrdup(value);
        } else if (!strcmp(name, "ss")) {
                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);
        }
  }
  

diff --cc cgit.h
index 80c3902b5e5dec8e16b6b2bbaf60207ada344854,bb8f598b1f60457cebbf1beeb8f7de8e673e59e0..2b28d636e20ba1f79c398a83f9383d43cba9e2e0
--- 1/cgit.h
--- 2/cgit.h
+++ b/cgit.h
@@@ -146,7 -145,7 +146,8 @@@ struct cgit_query 
        char *sort;
        int showmsg;
        int ssdiff;
 +      int show_all;
+       int context;
        char *vpath;
  };
  

diff --cc shared.c
Simple merge