summaryrefslogtreecommitdiffstats
path: root/docs/zh-cn/newbs_git_resolving_merge_conflicts.md
Commit message (Collapse)AuthorAgeFilesLines
* [Docs] zh-cn document translate: git parts (#15576)IskandarMa2022-04-221-0/+86
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>