Commits

Friedrich Kastner-Masilko committed e85aaaa

#9: casestop: fix for 2.6 upwards

Comments (0)

Files changed (1)

 
 def hook(ui, repo, *args, **kwargs):
     '''hook to stop commiting case-folding collisions'''
-    merge._checkcollision(repo[None])
+    merge._checkcollision(repo, repo[None].manifest(), [], [])
 
 def reposetup(ui, repo):
     ui.setconfig('hooks', 'precommit.casestop', hook)