# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1535174464 25200
# Node ID f98d3c57906fd31a3068446a5448a655cc22f108
# Parent  eebd591803ab712cbd0c7cf0971c4944839300f4# Parent  d750a6c9248d9dd97de089f7d7e8da7dd99a0ebf
merge with stable

diff -r eebd591803ab -r f98d3c57906f mercurial/scmutil.py