Skip to content

Commit

Permalink
diff3: update path placeholders (tldr-pages#10224)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

---------

Co-authored-by: Jack Lin <[email protected]>
  • Loading branch information
kbdharun and blueskyson authored May 24, 2023
1 parent 06fe1c1 commit 709ad35
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pages.pt_BR/linux/diff3.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 2 deletions pages.zh/linux/diff3.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 2 deletions pages/linux/diff3.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}}`

0 comments on commit 709ad35

Please sign in to comment.