Merge branch 'ph/stash-rerere' into maint-1.7.11
* ph/stash-rerere: stash: invoke rerere in case of conflict test: git-stash conflict sets up rerere
Showing
想要评论请 注册 或 登录
* ph/stash-rerere: stash: invoke rerere in case of conflict test: git-stash conflict sets up rerere