Mercurial > hg

diff tests/failfilemerge.py @ 40981:08f5482a6755

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: spawn all python instances with legacy stdio enabled on Windows This fixes 6 more tests. See ef7119cd4965.
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 17 Dec 2018 18:25:18 -0500
parents c0ce60459d84
children 2372284d9457
line wrap: on
line diff