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
Junio C Hamano committed
Sep 11, 2012 at 11:10 UTC
ef92392b6c8596b61eab6f2045a54c086f340cf7
No changes.