From 8565d3667f9929cd4c994d7ee260db86973f60fa Mon Sep 17 00:00:00 2001 From: Mirinda <40844183+mirinda123@users.noreply.github.com> Date: Fri, 19 Nov 2021 21:33:21 +0800 Subject: [PATCH] diff3: add Chinese translation (#7457) --- pages.zh/linux/diff3.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 pages.zh/linux/diff3.md diff --git a/pages.zh/linux/diff3.md b/pages.zh/linux/diff3.md new file mode 100644 index 000000000..cd5287992 --- /dev/null +++ b/pages.zh/linux/diff3.md @@ -0,0 +1,12 @@ +# diff3 + +> 逐行比较三个文件。 +> 更多信息:. + +- 比较文件: + +`diff3 {{文件1}} {{文件2}} {{文件3}}` + +- 展示所有的变化,同时列出冲突: + +`diff3 --show-all {{文件1}} {{文件2}} {{文件3}}`