Mercurial > hg
comparison tests/test-convert-hg-startrev @ 7785:660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 10 Feb 2009 22:47:38 +0100 |
| parents | 6e253aa04ff7 |
| children | 5b7da468531b |
comparison
equal
deleted
inserted
replaced
| 7784:8a217626bb0c | 7785:660c8dd44060 |
|---|