Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint
* cb/maint-merge-recursive-submodule-fix: simplify output of conflicting merge update cache for conflicting submodule entries add tests for merging with submodules
Showing
t/t7405-submodule-merge.sh
0 → 100755
想要评论请 注册 或 登录