##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

patch: remove applydiff() useless updatedir and rejmerge arguments
patch: remove applydiff() useless updatedir and rejmerge arguments
Matt Mackall - - Load All Authors

File last commit:

r4535:720ae508 default
r7147:94cf0d1f default
Show More
test-586
19 lines | 172 B | text/plain | TextLexer
/ tests / test-586
History | Source | Raw |Copy content |Copy permalink
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