summaryrefslogtreecommitdiffstats
path: root/docs/ja/newbs_git_resolving_merge_conflicts.md
Commit message (Expand)AuthorAgeFilesLines
* [Docs] Update check commands in Japanese documents (#7787)Takeshi ISHII2020-01-051-1/+1
* Japanese translation of docs/newbs_git_*.md (#7689)Takeshi ISHII2019-12-281-0/+94