Mercurial > hg-stable

diff contrib/editmerge @ 38989:6bfd1054d867

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: demonstrate that no requested merge tool is ignored if missing If you explicitly configure a merge tool, it seems wrong that we don't even warn if we can't find it. This patch adds a test case that demonstrates that. Differential Revision: https://phab.mercurial-scm.org/D3974
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Jul 2018 22:51:50 -0700
parents 612502900a2d
children
line wrap: on
line diff