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
This commit is contained in:
Junio C Hamano 2006-04-07 16:52:59 -07:00
commit d69dc373cb

4
gitk
View File

@ -2230,7 +2230,7 @@ proc donefilediff {} {
}
}
proc findcont {id} {
proc findcont {} {
global findid treediffs parentlist
global ffileline findstartline finddidsel
global displayorder numcommits matchinglines findinprogress
@ -2700,7 +2700,7 @@ proc getmergediffline {mdf id np} {
incr nextupdate 100
fileevent $mdf readable {}
update
fileevent $mdf readable [list getmergediffline $mdf $id]
fileevent $mdf readable [list getmergediffline $mdf $id $np]
}
}