Mercurial > hg

diff tests/test-pathconflicts-basic.t @ 46361:dfca84970da8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) This avoids some pointless copying. Differential Revision: https://phab.mercurial-scm.org/D8566
author Augie Fackler <augie@google.com>
date Mon, 18 May 2020 17:29:53 -0400
parents 0b46e1aa7760
children dc00324e80f4
line wrap: on
line diff