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/linux/diff3.md
View File

@@ -5,8 +5,8 @@
- Compare files:
`diff3 {{file1}} {{file2}} {{file3}}`
`diff3 {{path/to/file1}} {{path/to/file2}} {{path/to/file3}}`
- Show all changes, outlining conflicts:
`diff3 --show-all {{file1}} {{file2}} {{file3}}`
`diff3 --show-all {{path/to/file1}} {{path/to/file2}} {{path/to/file3}}`