Merge llvm, clang, lld, lldb, compiler-rt and libc++ r307894, and update

[FreeBSD/FreeBSD.git] / usr.bin / diff3 / tests / 2.txt

This is a more complete test
which multiple lines
and a few typos to fix
also I plan to add few lines
New line
    and to remove
other lines