Mercurial > hg
view tests/test-convert-bzr-treeroot.out @ 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 | 209ef5f3534c |
| children |
line wrap: on
line source
% change the id of the tree root initializing destination source-hg repository scanning source... sorting... converting... 1 Initial add 0 Changed root % manifest of tip 644 file