summaryrefslogtreecommitdiff
path: root/t/t7508-status.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-11 11:10:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-11 11:10:12 -0700
commitef92392b6c8596b61eab6f2045a54c086f340cf7 (patch)
tree961a30992de888f4fd135507cb33ebf1f6bfcf56 /t/t7508-status.sh
parentMerge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11 (diff)
parentstash: invoke rerere in case of conflict (diff)
downloadtgif-ef92392b6c8596b61eab6f2045a54c086f340cf7.tar.xz
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
Diffstat (limited to 't/t7508-status.sh')
0 files changed, 0 insertions, 0 deletions