##// END OF EJS Templates
Updated copyright notices and add "and others" to "hg version"
Updated copyright notices and add "and others" to "hg version"

File last commit:

r4535:720ae508 default
r4635:63b9d2de default
Show More
test-586
19 lines | 172 B | text/plain | TextLexer
Matt Mackall
commit: fix bug where dirstate for removed file is confused...
r4535 #!/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