[issue226] Strange hgmerge invocation behaviour

[Manpreet Singh]

New submission from Manpreet Singh <junkblocker at yahoo.com>:

In case that EDITOR and MERGE are not defined and hgmerge is invoked, the
hgmerge shell script is getting interpreted by python instead of shell as
indicated by the message below.

-----------------------------
C:\home\mnsingh\work\c>hg up -m --traceback
resolving manifests
merging abc.txt
resolving abc.txt
  File "c:\home\mnsingh\bin\hgmerge", line 20
    if [ -z "$EDITOR" ]; then
                    ^
SyntaxError: invalid syntax
merging abc.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
(branch merge, don't forget to commit)
------------------------------------

The behaviour has been seen on Solaris and Windows (the two platforms I have
accecss to).

----------
messages: 1124
nosy: bos, junkblocker
priority: bug
status: unread
title: Strange hgmerge invocation behaviour

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