Phil Cohen <phil...@fb.com> writes: > # HG changeset patch > # User Phil Cohen <phil...@fb.com> > # Date 1494553123 25200 > # Thu May 11 18:38:43 2017 -0700 > # Node ID 90180de768113d9f6b1ec990a634ec4b872636a0 > # Parent 8f1a2b848b52ea7bf3fe2404e3b62924c7aae93f > merge: use repo.wvfs.setflags() instead of util.setflags() > > Most merge.py code goes through the vfs instead of maniulating > files directly, so let's do the same here.
(already reviewed in person) This looks good to me!
signature.asc
Description: PGP signature
_______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
