X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gitk;h=f88c06e565ce34cd3985ea22d35e33735ed4f0fa;hb=1cd95087c331e17c44a8b62f0614d55e621dcfd4;hp=26fa79af7ae5bc673f377a8393d5ab6c39ef54ca;hpb=9cda21defb0ad18f50b4dcea9f027f75a15131fd;p=git.git

diff --git a/gitk b/gitk
index 26fa79af..f88c06e5 100755
--- a/gitk
+++ b/gitk
@@ -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]
     }
 }