Mercurial > hg

comparison mercurial/mergeutil.py @ 41570:1f2714052d7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't unnecessarily calculate absolute path I think this also makes the code clearer (and prepares for a later patch that replaces origpath()). Differential Revision: https://phab.mercurial-scm.org/D5849
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 04 Feb 2019 21:23:44 -0800
parents c1149533676b
children 2372284d9457
comparison
equal deleted inserted replaced
41569:ef2295651351 41570:1f2714052d7e