largefile: use `update_file` instead of `normal`

This is the newer, more semantic API.

Differential Revision: https://phab.mercurial-scm.org/D11145

hgext/largefiles/overrides.py

@@ -1805,7 +1805,7 b' def mergeupdate(orig, repo, node, branch'
             # to avoid leaving all largefiles as dirty and thus rehash them, mark
             # all the ones that didn't change as clean
             for lfile in oldclean.difference(filelist):
-                lfdirstate.normal(lfile)
+                lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
             lfdirstate.write()
 
             if branchmerge or force or partial: