From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Dec 2008 06:59:41 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.1-rc1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39a76bdd7de18b2bb2651dcb8136563df41e84f7;p=thirdparty%2Fgit.git

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Avoid handling the Return key twice in Add Branch
  gitk: Show local changes properly when we have a path limit
  gitk: Fix switch statement in parseviewargs
  gitk: Index line[hnd]tag arrays by id rather than row number
---

39a76bdd7de18b2bb2651dcb8136563df41e84f7
diff --cc gitk-git/gitk
index 3353f4a271,f7f177621c..f7f177621c
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk