view tests/test-586 @ 5550:db6633f11d59

cmdutil: make "files" list all files, add "file_mods" for modified files
author Patrick Mezard <pmezard@gmail.com>
date Sat, 24 Nov 2007 20:16:59 +0100
parents 720ae5085ee3
children f1af59451c0c
line wrap: on
line source

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A