ctome
/
tldr
mirror of https://github.com/CrimsonTome/tldr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tldr/pages.zh/linux/diff3.md

13 lines
370 B
Markdown
Raw Normal View History

diff3: add Chinese translation (#7457)
2021-11-19 13:33:21 +00:00
# diff3
> 逐行比较三个文件。
> 更多信息：<https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff3.html>.
- 比较文件：
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 04:30:31 +01:00
`diff3 {{路径/到/文件1}} {{路径/到/文件2}} {{路径/到/文件3}}`
diff3: add Chinese translation (#7457)
2021-11-19 13:33:21 +00:00
- 展示所有的变化，同时列出冲突：
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 04:30:31 +01:00
`diff3 --show-all {{路径/到/文件1}} {{路径/到/文件2}} {{路径/到/文件3}}`