##// END OF EJS Templates
tests: fix test results for 07faba78cf5a
tests: fix test results for 07faba78cf5a

File last commit:

r4535:720ae508 default
r7437:3cdaac73 default
Show More
test-586
19 lines | 172 B | text/plain | TextLexer
#!/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