Mercurial > hg
view tests/test-issue352.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 | 09847b90beae |
children |
line wrap: on
line source
adding he llo abort: '\n' and '\r' disallowed in filenames: 'he\rllo' adding he llo abort: '\n' and '\r' disallowed in filenames: 'he\rllo' adding hell o abort: '\n' and '\r' disallowed in filenames: 'hell\no' adding hell o abort: '\n' and '\r' disallowed in filenames: 'hell\no' f he llo he llo f hell o hell o