diff3: add Chinese translation (#7457)
This commit is contained in:
12
pages.zh/linux/diff3.md
Normal file
12
pages.zh/linux/diff3.md
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
# diff3
|
||||||
|
|
||||||
|
> 逐行比较三个文件。
|
||||||
|
> 更多信息:<https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff3.html>.
|
||||||
|
|
||||||
|
- 比较文件:
|
||||||
|
|
||||||
|
`diff3 {{文件1}} {{文件2}} {{文件3}}`
|
||||||
|
|
||||||
|
- 展示所有的变化,同时列出冲突:
|
||||||
|
|
||||||
|
`diff3 --show-all {{文件1}} {{文件2}} {{文件3}}`
|
Reference in New Issue
Block a user