tests/test-diff-subdir
author Brendan Cully <brendan@kublai.com>
Sun, 06 May 2007 20:27:45 -0700
changeset 4410 bbc97d419b16
parent 3199 096f1c73cdc3
permissions -rwxr-xr-x
Add fast-forward branch merging

#!/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 .