Handle CRLF eols following merge-line tokens
Handle CRLF eols following merge-line tokens

robertoraggi/cplusplus,robertoraggi/cplusplus,robertoraggi/cplusplus,robertoraggi/cplusplus,robertoraggi/cplusplus,robertoraggi/cplusplus