From: Junio C Hamano <junkio@cox.net>
Date: Fri, 7 Apr 2006 23:52:59 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.3.0-rc3~7
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d69dc373cbf58d88d19dcbc6cff37e12b17f8fd2;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix incorrect invocation of getmergediffline
  [PATCH] gitk: Fix searching for filenames in gitk
---

d69dc373cbf58d88d19dcbc6cff37e12b17f8fd2