##// END OF EJS Templates
merge: define conflict marker labels in filemerge()...
merge: define conflict marker labels in filemerge() Moves the conflict marker definition up to filemerge, so it gets applied to all merge strategies, and so in a future patch we can manipulate the markers.

File last commit:

r8809:6fce3633 default
r21273:20b8090d default
Show More
pubring.gpg
0 lines | 597 B | application/octet-stream | TextLexer
/ tests / gpg / pubring.gpg
Binary file (application/octet-stream)