##// 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-conflict.out
24 lines | 421 B | text/plain | TextLexer
/ tests / test-conflict.out
History | Annotation | Raw |Copy content |Copy permalink
+ hg init
+ echo nothing
+ hg add a
+ hg commit -m ancestor -d '0 0'
+ echo something
+ hg commit -m branch1 -d '0 0'
+ hg co 0
+ echo 'something else'
+ hg commit -m branch2 -d '0 0'
+ export HGMERGE=merge
+ HGMERGE=merge
+ hg up -m 1
merge: warning: conflicts during merge
merging a
merging a failed!
+ hg id
32e80765d7fe+75234512624c+ tip
+ grep -Ev '>>>|<<<' a
something else
=======
something
+ hg status
M a
? .out