view tests/test-586 @ 4537:2f489b00f8eb

Merge with mpm
author Brendan Cully <brendan@kublai.com>
date Sun, 10 Jun 2007 21:05:01 -0700
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