aboutsummaryrefslogtreecommitdiffstats
path: root/docs/ja/newbs_git_resolving_merge_conflicts.md
diff options
context:
space:
mode:
authorTakeshi ISHII <2170248+mtei@users.noreply.github.com>2020-01-06 16:43:11 +0900
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2020-01-05 23:43:11 -0800
commitb3b115bcc4466b0320a6725c8e994a9ef4186328 (patch)
treebd3ac1a5c9897d972c93e9b90ba4020cd83ed618 /docs/ja/newbs_git_resolving_merge_conflicts.md
parentf2c61f8840241c0091ad7fcc3f3daa8082111842 (diff)
downloadfirmware-b3b115bcc4466b0320a6725c8e994a9ef4186328.tar.gz
firmware-b3b115bcc4466b0320a6725c8e994a9ef4186328.tar.bz2
firmware-b3b115bcc4466b0320a6725c8e994a9ef4186328.zip
[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.
Diffstat (limited to 'docs/ja/newbs_git_resolving_merge_conflicts.md')
-rw-r--r--docs/ja/newbs_git_resolving_merge_conflicts.md2
1 files changed, 1 insertions, 1 deletions
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
-->
ブランチでの作業の完了に時間がかかる場合、他の人が行った変更が、プルリクエストを開いたときにブランチに加えた変更と競合することがあります。