comparison tests/test-merge10.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 368a4ec603cc
children a3d73b3e1f8a
comparison
equal deleted inserted replaced
7784:8a217626bb0c 7785:660c8dd44060