Mercurial > hg
view tests/test-dispatch.py.out @ 38952:0e58c5b20745
mergetool: warn if ui.merge points to nonexistent tool
This adds a warning when ui.merge is configured but points to an
executable that doesn't exist. It gets printed once per fail, but that
seems to be how our other warnings about merge tools are reported.
Differential Revision: https://phab.mercurial-scm.org/D3975
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 23 Jul 2018 22:51:53 -0700 |
parents | 6f9ac3cb0987 |
children |
line wrap: on
line source
running: init test1 result: 0 running: add foo result: 0 running: commit -m commit1 -d 2000-01-01 foo result: 0 running: commit -m commit2 -d 2000-01-02 foo result: 0 running: log -r 0 changeset: 0:0e4634943879 user: test date: Sat Jan 01 00:00:00 2000 +0000 summary: commit1 result: 0 running: log -r tip changeset: 1:45589e459b2e tag: tip user: test date: Sun Jan 02 00:00:00 2000 +0000 summary: commit2 result: 0