Mercurial > hg

comparison mercurial/filemerge.py @ 36930:36de8a3c429c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: use configoverride context manager for ui.forcemerge Differential Revision: https://phab.mercurial-scm.org/D2761
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 09 Mar 2018 12:48:00 -0800
parents 5bc7ff103081
children a4a95bd7158d
comparison
equal deleted inserted replaced
36929:cc2bfc7d5362 36930:36de8a3c429c