pstef@thinkpad:/usr/src/usr.bin/diff3/tests $ gdiff --strip-trailing-cr 1cr.txt 2.txt | cat -v
3c3
< and a few typ0s to fix
---
> and a few typos to fix
4a5
> New line
pstef@thinkpad:/usr/src/usr.bin/diff3/tests $ diff --strip-trailing-cr 1cr.txt 2.txt | cat -v
3c3
< and a few typ0s to fix^M
---
> and a few typos to fix
4a5
> New line