Mercurial > hg
view tests/test-clone-cgi.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 | 9f0e52e1df77 |
children |
line wrap: on
line source
% initialize repository adding a % try hgweb request 0 1f424bb22ec05c3c6bc866b6e67efe43 page1