The default output format is a somewhat human-readable representation of the changes.
The -e, -E, -x, -X (and corresponding long) options cause an ed script to be output instead of the default.
Finally, the -m (--merge) option causes diff3 to do the merge internally and output the actual merged file. For unusual input, this is more robust than using ed. Exit status is 0 if successful, 1 if conflicts, 2 if trouble.If a FILE is '-', read standard input.'-' specified for more than one input fileinternal error: invalid diff type passed to outputinternal error: screwup in format of diff blocks-e, --ed output ed script incorporating changes from OLDFILE to YOURFILE into MYFILE-E, --show-overlap like -e, but bracket conflicts-3, --easy-only like -e, but incorporate only nonoverlapping changes-x, --overlap-only like -e, but incorporate only overlapping changes-X like -x, but bracket conflicts-i append 'w' and 'q' commands to ed scripts-m, --merge output actual merged file, according to -A if no other options are given-a, --text treat all files as text --strip-trailing-cr strip trailing carriage return on input-T, --initial-tab make tabs line up by prepending a tab --diff-program=PROGRAM use PROGRAM to compare files-L, --label=LABEL use LABEL instead of file name (can be repeated up to three times) --help display this help and exit-v, --version output version information and exit%s%s:%ld,%lds/^\.// write failedstandard output-a--strip-trailing-cr--horizon-lines=100--pipeforkfstatread failedclosewaitpid%s: diff failed: --- ||||||| %s /usr/share/localeRandy SmithGNU diffutilsdiff3%s
%s
%s %s too many file label optionsaeimvx3AEL:TXincompatible optionsmissing operand after '%s'extra operand '%s'======= >>>>>>> %s %lda <<<<<<< %s %ld,%ldd %lda %ld,%ldc w q input file shrank====%s %d:No newline at end of file \ %s diff-programeasy-onlyhelpinitial-tablabelmergeoverlap-onlyshow-allshow-overlaptextversiondiffjb��'c��'c��'c��'c��'c��'c��'c��'c��'c��'c��'c��'c��'c��Sb��'c��'c��'c���_��'c��'c��'c��'c��'c��'c��.b��'c��'c��'c��'c��'c��'c��'c��"b��'c��'c��'c���_��'c��'c��'c��'c��'c��'c��'c��'c��b��'c��'c��'c��`��'c��'c��'c�� b��'c��'c��'c���a��'c��'c��'c��'c��'c��'c��'c��'c���a��'c���a��'c��'c��'c��'c��'c��'c��'c��va��`��`��3.6program errorstack overflowA NULL argv[0] was passed through an exec system call. /.libs/lt-mbuiter.hiter->cur.wc == 0mbsinit (&iter->state)*iter->cur.ptr == '\0'%s (%s)UTF-8mbuiter_multi_nextmbiter.hmbiter_multi_next%s (%s) %s %s %s (C)Written by %s. Written by %s and %s. Written by %s, %s, and %s.
Report bugs to: %s bug-diffutils@gnu.org%s home page: <%s>
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law.