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.
% create test repository
adding a
adding b
adding c
% churn all
user3 3 ***************************************************************
user2 2 ******************************************
user1 1 *********************
% churn up to rev 2
user2 2 ***************************************************************
user1 1 *******************************
% churn with aliases
alias3 3 **************************************************************
user2 2 *****************************************
alias1 1 ********************
% churn with column specifier
user3 3 ***********************
user2 2 ***************
user1 1 *******
% churn by hour
06 1 **********************
09 2 ********************************************
12 3 ******************************************************************