diff mercurial/pure/osutil.py @ 26361:6b4a0c602bec

merge: fix mergestate comment
author timeless@mozdev.org
date Fri, 25 Sep 2015 00:54:20 -0400
parents 977102cb12fc
children 810337ae1b76
line wrap: on
line diff