lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-04-22 05:42:09 +02:00
Code Activity
tldr/pages.zh/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

370 B
Raw Blame History

diff3

逐行比较三个文件。 更多信息：https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff3.html.

  • 比较文件：

diff3 {{路径/到/文件1}} {{路径/到/文件2}} {{路径/到/文件3}}

  • 展示所有的变化，同时列出冲突：

diff3 --show-all {{路径/到/文件1}} {{路径/到/文件2}} {{路径/到/文件3}}