##// END OF EJS Templates
commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

File last commit:

r4659:7a7d4937 default
r6385:0d4e068e default
Show More
test-hgrc
7 lines | 105 B | text/plain | TextLexer
Benoit Boissinot
make readconfig take a filename instead of a file pointer as argument...
r1473 #!/bin/sh
mkdir t
cd t
hg init
echo "invalid" > .hg/hgrc
Thomas Arendsen Hein
Kill trailing spaces
r4659 hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:"