lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-04-29 23:24:55 +02:00
Code 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pages.pt_BR/linux/diff3.md
View file

@ -5,8 +5,8 @@
- Comparar os arquivos:
`diff3 {{arquivo1}} {{arquivo2}} {{arquivo3}}`
`diff3 {{caminho/para/arquivo1}} {{caminho/para/arquivo2}} {{caminho/para/arquivo3}}`
- Exibir todas as diferenças, destacando os conflitos:
`diff3 --show-all {{arquivo1}} {{arquivo2}} {{arquivo3}}`
`diff3 --show-all {{caminho/para/arquivo1}} {{caminho/para/arquivo2}} {{caminho/para/arquivo3}}`

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}}`

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}}`