view tests/test-symlink-basic.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.

abort: file dangling not tracked!
changeset:   0:cabd88b706fc
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       dangling
description:
add symlink


2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling
% rev 0:
dangling -> nothing
% rev 1:
dangling -> void
% modifying link
dangling -> empty
% reverting to rev 0:
reverting dangling
dangling -> nothing
% backups:
dangling.orig -> empty
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% copies
copying dangling to dangling2
A dangling2
  dangling
dangling -> void
dangling2 -> void
% issue995
0 files updated, 0 files merged, 1 files removed, 0 files unresolved