##// END OF EJS Templates
diffstat: don't fail on merges...
diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>

File last commit:

r6336:4b0c9c67 default
r7664:3cc74ee7 default
Show More
test-issue842
20 lines | 279 B | text/plain | TextLexer
hg init test
cd test
echo foo > a
hg ci -Ama
hg up -r0000
echo bar > a
echo % should issue warning
hg ci -Amb
hg up -r0000
echo stuffy > a
echo % should not issue warning
hg ci -q -Amc
hg up -r0000
echo crap > a
hg branch testing
echo % should not issue warning
hg ci -q -Amd