diff3: implement --strip-trailing-cr
Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D31626