Merge branch 'jc/deprecate'
As previously announced, diff-stages and resolve are now gone.
Showing
Documentation/git-resolve.txt
已删除
100644 → 0
builtin-diff-stages.c
已删除
100644 → 0
想要评论请 注册 或 登录
As previously announced, diff-stages and resolve are now gone.