mirror of
https://github.com/tldr-pages/tldr.git
synced 2024-10-06 00:07:20 +03:00
709ad35340
* 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>
341 B
341 B
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}}