changeset 23893 | f21a0d6d6efd |
parent 23887 | 054cfb7c33ae |
child 23976 | 344939126579 |
--- 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: