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

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

Make tests work on Solaris:...
Make tests work on Solaris: - replacement for mktemp - fall back if shell arithmetic doesn't work - replacement for 'set -x' (which results look different with some shells) - "FOO=bar; export FOO" instead of "export FOO=bar" - don't use 'if ! ...'
mpm@selenic.com - - Load All Authors

File last commit:

r775:122449dd default
r798:c28f9feb default
Show More
test-merge3.out
11 lines | 189 B | text/plain | TextLexer
/ tests / test-merge3.out
History | Annotation | Raw |Copy content |Copy permalink
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ touch b
+ hg add b
+ rm b
+ hg commit -A '-mcomment #1' -d '0 0'
adding .out
removing b
b never committed!