summaryrefslogtreecommitdiffstats
path: root/docs/zh-cn/newbs_git_resolving_merge_conflicts.md
Commit message (Expand)AuthorAgeFilesLines
* [Docs] zh-cn document translate: git parts (#15576)IskandarMa2022-04-221-0/+86
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-13 10:42:09 +0000
[cgit] Unable to lock slot /tmp/cgit/c5100000.lock: No such file or directory (2)