Merge branch 'maint'
* maint: pre-commit hook: complain about conflict markers. git-merge: a bit more readable user guidance.
Showing
想要评论请 注册 或 登录
* maint: pre-commit hook: complain about conflict markers. git-merge: a bit more readable user guidance.