From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Aug 2007 18:36:04 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.3-rc6~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f16eb1f6a3f9a1a09a61f0cd07e9c9ff9ee54530;p=git.git

Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
  [PATCH] gitk: Make the date/time display configurable
  [PATCH] gitk: Let user easily specify lines of context in diff view
  gitk: Fix warning when removing a branch
---

f16eb1f6a3f9a1a09a61f0cd07e9c9ff9ee54530