##// END OF EJS Templates
use posix compliant option for head...
use posix compliant option for head head -N is not posix compliant, head -n N should be used instead

File last commit:

r925:5a034646 default
r1539:5e47e42b default
Show More
test-conflict.out
8 lines | 135 B | text/plain | TextLexer
merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a