Diff3 example

diff3

Compare three files line by line.

  • Compare files:

diff3 {{file1}} {{file2}} {{file3}}

  • Show all changes, outlining conflicts:

diff3 --show-all {{file1}} {{file2}} {{file3}}