From: Junio C Hamano <junkio@cox.net>
Date: Fri, 7 Apr 2006 23:53:06 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc4~30
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1b25fd191d040ab59f8124694152c1577b13d968;p=git.git

Merge branch 'master' into next

* master:
  gitk: Fix incorrect invocation of getmergediffline
  [PATCH] gitk: Fix searching for filenames in gitk
  count-delta: match get_delta_hdr_size() changes.
  check patch_delta bounds more carefully
---

1b25fd191d040ab59f8124694152c1577b13d968