stash: invoke rerere in case of conflict
authorPhil Hord <hordp@cisco.com>
Tue, 10 Jul 2012 22:52:28 +0000 (18:52 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2012 17:59:17 +0000 (10:59 -0700)
commit743bf6d...b07f0c5717bf5c37b8b50ae9de619c83
tree7f5fa1c...8bca0b31bce92d861d560ff2bd99b62acopy hash to clipboard (tree)
parent79dc2d0...0250b4a90dfc83ae69c116e08c9df0a3copy hash to clipboard (diff)
git-stash.sh
t/t7610-mergetool.sh