summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-04-06 00:20:03 (GMT)
committerPaul Mackerras <paulus@samba.org>2006-04-06 00:20:03 (GMT)
commitc5a4c4debec43ff98053cb6b69d35d63e45ee131 (patch)
tree614c3b5cede681c17764a7f1d59357fc1f053581 /gitk
parent37543541257c1066f8222e5c62933266936efabf (diff)
downloadgit-c5a4c4debec43ff98053cb6b69d35d63e45ee131.zip
git-c5a4c4debec43ff98053cb6b69d35d63e45ee131.tar.gz
git-c5a4c4debec43ff98053cb6b69d35d63e45ee131.tar.bz2
gitk: Fix incorrect invocation of getmergediffline
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitk b/gitk
index e1848cd..f88c06e 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]
}
}