From 709ad3534006e4b4db9f0dbeec4669f53203ccf2 Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Wed, 24 May 2023 09:00:31 +0530 Subject: [PATCH] diff3: update path placeholders (#10224) * 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 --------- Co-authored-by: Jack Lin --- pages.pt_BR/linux/diff3.md | 4 ++-- pages.zh/linux/diff3.md | 4 ++-- pages/linux/diff3.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pages.pt_BR/linux/diff3.md b/pages.pt_BR/linux/diff3.md index b8daa9b59..8f63b5334 100644 --- a/pages.pt_BR/linux/diff3.md +++ b/pages.pt_BR/linux/diff3.md @@ -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}}` diff --git a/pages.zh/linux/diff3.md b/pages.zh/linux/diff3.md index cd5287992..0b0b35574 100644 --- a/pages.zh/linux/diff3.md +++ b/pages.zh/linux/diff3.md @@ -5,8 +5,8 @@ - 比较文件： -`diff3 {{文件1}} {{文件2}} {{文件3}}` +`diff3 {{路径/到/文件1}} {{路径/到/文件2}} {{路径/到/文件3}}` - 展示所有的变化，同时列出冲突： -`diff3 --show-all {{文件1}} {{文件2}} {{文件3}}` +`diff3 --show-all {{路径/到/文件1}} {{路径/到/文件2}} {{路径/到/文件3}}` diff --git a/pages/linux/diff3.md b/pages/linux/diff3.md index bbd226e35..879402b06 100644 --- a/pages/linux/diff3.md +++ b/pages/linux/diff3.md @@ -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}}`