Mercurial > hg

comparison tests/failfilemerge.py @ 44400:0e5e192adb6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use new, use-case-specific methods from merge module Differential Revision: https://phab.mercurial-scm.org/D8169
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 26 Feb 2020 10:48:56 -0800
parents 2372284d9457
children a736ab681b78
comparison
equal deleted inserted replaced
44399:a45ffad9ae98 44400:0e5e192adb6f