Mercurial > hg
comparison tests/test-merge-tools.t @ 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 | 6bfd1054d867 |
| children | 6618634e3325 |
comparison
equal
deleted
inserted
replaced
| 38951:6bfd1054d867 | 38952:0e58c5b20745 |
|---|---|
| 1746 true.priority=1 | 1746 true.priority=1 |
| 1747 true.executable=cat | 1747 true.executable=cat |
| 1748 missingbinary.executable=doesnotexist | 1748 missingbinary.executable=doesnotexist |
| 1749 # hg update -C 1 | 1749 # hg update -C 1 |
| 1750 $ hg merge -y -r 2 --config ui.merge=missingbinary | 1750 $ hg merge -y -r 2 --config ui.merge=missingbinary |
| 1751 merging f | 1751 couldn't find merge tool missingbinary (for pattern f) |
| 1752 merging f | |
| 1753 couldn't find merge tool missingbinary (for pattern f) | |
| 1752 revision 1 | 1754 revision 1 |
| 1753 space | 1755 space |
| 1754 revision 0 | 1756 revision 0 |
| 1755 space | 1757 space |
| 1756 revision 2 | 1758 revision 2 |