From b3b115bcc4466b0320a6725c8e994a9ef4186328 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Mon, 6 Jan 2020 16:43:11 +0900
Subject: [Docs] Update check commands in Japanese documents (#7787)

The Japanese documents included a sample command to check the original document changes. But there was something wrong, so I fixed it.
---
 docs/ja/newbs_git_resolving_merge_conflicts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/ja/newbs_git_resolving_merge_conflicts.md')

diff --git a/docs/ja/newbs_git_resolving_merge_conflicts.md b/docs/ja/newbs_git_resolving_merge_conflicts.md
index f1096e52e..893c3d503 100644
--- a/docs/ja/newbs_git_resolving_merge_conflicts.md
+++ b/docs/ja/newbs_git_resolving_merge_conflicts.md
@@ -3,7 +3,7 @@
 <!---
   grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh
   original document: adf4acf59:docs/newbs_git_resolving_merge_conflicts.md
-  git diff adf4acf59 HEAD docs/newbs_git_resolving_merge_conflicts.md | cat
+  git diff adf4acf59 HEAD -- docs/newbs_git_resolving_merge_conflicts.md | cat
 -->
 
 ブランチでの作業の完了に時間がかかる場合、他の人が行った変更が、プルリクエストを開いたときにブランチに加えた変更と競合することがあります。
-- 
cgit v1.2.3