DawnMagnet/tldr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

diff3: update path placeholders (#10224)

Browse Source 
* 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>
This commit is contained in:
K.B.Dharun Krishna
2023-05-24 09:00:31 +05:30
committed by GitHub
parent 06fe1c14c2
commit 709ad35340
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages.zh/linux/diff3.md
View File

@@ -5,8 +5,8 @@
- 比较文件：
`diff3 {{文件1}} {{文件2}} {{文件3}}`
`diff3 {{路径/到/文件1}} {{路径/到/文件2}} {{路径/到/文件3}}`
- 展示所有的变化，同时列出冲突：
`diff3 --show-all {{文件1}} {{文件2}} {{文件3}}`
`diff3 --show-all {{路径/到/文件1}} {{路径/到/文件2}} {{路径/到/文件3}}`