test: git-stash conflict sets up rerere
authorPhil Hord <hordp@cisco.com>
Tue, 10 Jul 2012 22:52:27 +0000 (18:52 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2012 17:56:19 +0000 (10:56 -0700)
commit79dc2d0...0250b4a90dfc83ae69c116e08c9df0a3
treea3bec74...ae9380e4ab2ebd87ef52ac7420900d39copy hash to clipboard (tree)
parentd0f1ea6...03d97e63110fa7d50bb07f546a909b6ecopy hash to clipboard (diff)
t/t7610-mergetool.sh