From: Paul Mackerras <paulus@samba.org>
Date: Thu, 6 Apr 2006 00:20:03 +0000 (+1000)
Subject: gitk: Fix incorrect invocation of getmergediffline
X-Git-Tag: v1.3.0-rc3~7^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5a4c4debec43ff98053cb6b69d35d63e45ee131;p=git.git

gitk: Fix incorrect invocation of getmergediffline

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index e1848cd52..f88c06e56 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]
     }
 }