merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.

#!/bin/sh

hg init

mkdir alpha
touch alpha/one
mkdir beta
touch beta/two

hg add alpha/one beta/two
hg ci -m "start" -d "1000000 0"

echo 1 > alpha/one
echo 2 > beta/two

echo EVERYTHING
hg diff --nodates

echo BETA ONLY
hg diff --nodates beta

echo INSIDE BETA
cd beta
hg diff --nodates .