Merge git://git.kernel.org/pub/scm/gitk/gitk
commitd69dc373cbf58d88d19dcbc6cff37e12b17f8fd2
authorJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 23:52:59 +0000 (7 16:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 23:52:59 +0000 (7 16:52 -0700)
treed197b22962006c28387c9542c439def1b105ecb9
parentce18135d862b5dbc731d203b27c279529e58b54b
parentc5a4c4debec43ff98053cb6b69d35d63e45ee131
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