Mercurial > hg

diff tests/fakepatchtime.py @ 40465:1736450cd1df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: also deactivate `ui.merge` when testing merge tool We are about to introduce a default config for `ui.merge`. Since `test-merge-tools.t` is about testing merge configuration, we need to make sure it won't interfere.
author Boris Feld <boris.feld@octobus.net>
date Wed, 31 Oct 2018 19:12:32 +0100
parents c6061cadb400
children 2372284d9457
line wrap: on
line diff