[issue3346] test-merge-types.t fails if hgmerge is found in $PATH

[Thomas Arendsen Hein]

New submission from Thomas Arendsen Hein <thomas at intevation.de>:

If an executable named 'hgmerge' can be found in the directories listed in
$PATH, test-merge-types.t produces a different output:

--- /home/thomas/hg/repos/tah/tests/test-merge-types.t 
+++ /home/thomas/hg/repos/tah/tests/test-merge-types.t.err 
@@ -89,7 +89,7 @@
    a: versions differ -> m
   preserving a for resolve of a
   updating: a 1/1 files (100.00%)
-  couldn't find merge tool hgmerge
+  tool hgmerge can't handle symlinks
   picked tool 'internal:prompt' for a (binary False symlink True)
    no tool found to merge a
   keep (l)ocal or take (o)ther? l

ERROR: /home/thomas/hg/repos/tah/tests/test-merge-types.t output changed

This happens since the added test code in:
changeset:   16255:ca5cc2976574
branch:      stable
user:        Matt Mackall <mpm at selenic.com>
date:        Tue Mar 13 16:28:08 2012 -0500
summary:     merge: handle linear update to symlink correctly (issue3316)

The line causing the output is:
$ HGMERGE= hg up -y --debug

What should be tested here? Automatic selection of internal:prompt?

----------
messages: 19495
nosy: ThomasAH, mpm
priority: bug
status: unread
title: test-merge-types.t fails if hgmerge is found in $PATH

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue3346>
____________________________________________________