Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 23:53:06 +0000 (16:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 23:53:06 +0000 (16:53 -0700)
commit1b25fd191d040ab59f8124694152c1577b13d968
tree738a180e9620eb1a236c48a806e3052759eb5c24
parent0ba9ea97e2d621fd50ae4be22ee465096267dbae
parentd69dc373cbf58d88d19dcbc6cff37e12b17f8fd2
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