Mercurial > hg

diff mercurial/merge.py @ 44350:e80da7a63264

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tags: fix some type confusion exposed in python 3 # skip-blame just b-prefix and %-format cleanup, no meaningful change Differential Revision: https://phab.mercurial-scm.org/D8107
author Augie Fackler <augie@google.com>
date Mon, 10 Feb 2020 20:47:19 -0500
parents 9f8eddd2723f
children 218feb1a7e00
line wrap: on
line diff