Mercurial > hg

diff tests/test-simplemerge.py @ 30649:b0a0f7b9ed90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fsmonitor: fix exception message scraping pywatchman.CommandError formats its error message such that 'unable to resolve root' is not a prefix. This change fixes that by instead just searching for it as a substring.
author zphricz <zack.hricz@oculus.com>
date Wed, 21 Dec 2016 13:51:34 -0800
parents 2d433fa7ff44
children 68c43a416585
line wrap: on
line diff