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

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

Output file of 'export' is opened as binary (other OS)...
Output file of 'export' is opened as binary (other OS) # HG changeset patch # User thananck@yahoo.com # Node ID 7a240687674e6cf5a8dfd45973d7e3978b89af79 # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Output file of 'export' is opened as binary (other OS)
mpm@selenic.com - - Load All Authors

File last commit:

r591:eb46971f default
r615:ad2999fa default
Show More
test-conflict.out
24 lines | 445 B | text/plain | TextLexer
/ tests / test-conflict.out
History | Annotation | Raw |Copy content |Copy permalink
+ hg init
+ echo nothing
+ hg add a
+ hg commit -t ancestor -u test -d '0 0'
+ echo something
+ hg commit -t branch1 -u test -d '0 0'
+ hg co 0
+ echo 'something else'
+ hg commit -t branch2 -u test -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
C a
? .out