lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-04-22 16:22:08 +02:00
Code Activity
tldr/pages/linux/diff3.md
K.B.Dharun Krishna 709ad35340
diff3: update path placeholders (#10224) 
* diff3: update path placeholders

* diff3: update path placeholder in translations

* diff3: update placeholder in Chinese translation

* Apply suggestions from code review

Co-authored-by: Jack Lin <blueskyson1401@gmail.com>

---------

Co-authored-by: Jack Lin <blueskyson1401@gmail.com>
2023-05-24 11:30:31 +08:00

341 B
Raw Blame History

diff3

Compare three files line by line. More information: https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff3.html.

  • Compare files:

diff3 {{path/to/file1}} {{path/to/file2}} {{path/to/file3}}

  • Show all changes, outlining conflicts:

diff3 --show-all {{path/to/file1}} {{path/to/file2}} {{path/to/file3}}