view tests/test-merge3 @ 8545:3682a19bb637

merge: give hint as to how to discover uncommitted changes

Many users will try 'hg diff' here, and it will not show them missing files.

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "1000000 0"