##// 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:

r12430:60738066 default
r21273:20b8090d default
Show More
test-hghave.t
3 lines | 109 B | text/troff | Tads3Lexer
Testing that hghave does not crash when checking features
$ "$TESTDIR/hghave" --test-features 2>/dev/null