From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 20 Jun 2009 18:54:37 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.4-rc0~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4f6bc887de7957645b998a0b0e22bc4048f36dd;p=thirdparty%2Fgit.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Allow diff view without context lines
  gitk: Add another string to translation
  gitk: Add option 'Simple history' to the options menu
  gitk: Handle msysGit version during version comparisons
  gitk: Make more options easily accessible from Edit View dialog
  gitk: Check git version before using --textconv flag
  gitk: Use --textconv to generate diff text
  gitk: Update German translation.
---

d4f6bc887de7957645b998a0b0e22bc4048f36dd
diff --cc gitk-git/gitk
index 1a7887b252,4604c831fe..4604c831fe
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk