##// 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:

r749:7e4843b7 default
r798:c28f9feb default
Show More
test-merge3
10 lines | 149 B | text/plain | TextLexer
/ tests / test-merge3
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh -x
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"