X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gitk;h=f88c06e565ce34cd3985ea22d35e33735ed4f0fa;hb=c5a4c4debec43ff98053cb6b69d35d63e45ee131;hp=e1848cd528424b8d8df2d7646ad2e2d0860c40e2;hpb=37543541257c1066f8222e5c62933266936efabf;p=git.git

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