# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1576260640 28800
# Node ID cf065c6a0197de1728bb5e3fa5044d2821f07b87
# Parent  bc7d8f45c3b6f696197ceae58faee75e4b65805e# Parent  b06cf2809ec3486b25187ac2c8e766d6ac18763b
merge with stable

diff -r bc7d8f45c3b6 -r cf065c6a0197 mercurial/dirstate.py
diff -r bc7d8f45c3b6 -r cf065c6a0197 rust/hg-core/src/utils/files.rs