--- a/hgext/largefiles/overrides.py	Fri Jun 24 09:08:16 2016 +0200
+++ b/hgext/largefiles/overrides.py	Mon Jun 27 10:33:33 2016 +0200
@@ -546,7 +546,6 @@
 
     return orig(repo, actions, branchmerge)
 
-
 # Override filemerge to prompt the user about how they wish to merge
 # largefiles. This will handle identical edits without prompting the user.
 def overridefilemerge(origfn, premerge, repo, mynode, orig, fcd, fco, fca,