diff -r f2b6f37d537b -r f21a0d6d6efd hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py	Fri Jan 16 19:51:25 2015 +0100
+++ b/hgext/largefiles/overrides.py	Fri Jan 09 19:10:09 2015 +0100
@@ -1324,7 +1324,7 @@
             filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
 
         lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
-                                normallookup=partial)
+                                normallookup=partial, checked=linearmerge)
 
         return result
     finally: