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

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

Make test-verify SUSv3 compatible....
Make test-verify SUSv3 compatible. 'head -c' isn't supported on (at least) OpenBSD and is not part of SUSv3. Instead, use dd. See also: http://www.opengroup.org/onlinepubs/009695399/utilities/head.html
Augie Fackler - - Load All Authors

File last commit:

r7821:9fe7e6ac default
r8720:da1b9358 default
Show More
test-conflict.out
15 lines | 400 B | text/plain | TextLexer
/ tests / test-conflict.out
History | Annotation | Raw |Copy content |Copy permalink
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig