Merge branch 'jc/merge'
* branch 'jc/merge': git-merge: do not leak rev-parse output used for checking internally. git-merge: tighten error checking. merge: allow merging into a yet-to-be-born branch. git-merge: make it usable as the first class UI remove merge-recursive-old
Showing
compat/subprocess.py
已删除
100644 → 0
此差异已折叠。
git-merge-recursive-old.py
已删除
100755 → 0
此差异已折叠。
gitMergeCommon.py
已删除
100644 → 0
想要评论请 注册 或 登录