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

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

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.
Vadim Gelfer - - Load All Authors

File last commit:

r2248:b914f055 default
r6385:0d4e068e default
Show More
test-diff-newlines
8 lines | 161 B | text/plain | TextLexer
/ tests / test-diff-newlines
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a
hg ci -Ama -d '1 0'
echo clean diff >> a
hg ci -mb -d '2 0'
hg diff -r0 -r1