index e1848cd528424b8d8df2d7646ad2e2d0860c40e2..f88c06e565ce34cd3985ea22d35e33735ed4f0fa 100755 (executable)
--- a/gitk
+++ b/gitk
incr nextupdate 100
fileevent $mdf readable {}
update
- fileevent $mdf readable [list getmergediffline $mdf $id]
+ fileevent $mdf readable [list getmergediffline $mdf $id $np]
}
}