index 26fa79af7ae5bc673f377a8393d5ab6c39ef54ca..f88c06e565ce34cd3985ea22d35e33735ed4f0fa 100755 (executable)
--- a/gitk
+++ b/gitk
}
}
-proc findcont {id} {
+proc findcont {} {
global findid treediffs parentlist
global ffileline findstartline finddidsel
global displayorder numcommits matchinglines findinprogress
incr nextupdate 100
fileevent $mdf readable {}
update
- fileevent $mdf readable [list getmergediffline $mdf $id]
+ fileevent $mdf readable [list getmergediffline $mdf $id $np]
}
}