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

diff --cc gitk-git/gitk
index 3353f4a2717ceb72634b9311985b5570f06fe560,f7f177621ceecd749c8ec581f023607f1297f0be..f7f177621ceecd749c8ec581f023607f1297f0be
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk