summaryrefslogtreecommitdiff
path: root/t/aggregate-results.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-07-15 12:08:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-15 12:08:36 -0700
commit4bd874c8f30d55b6189dacf1d769855ed2df4299 (patch)
treeb449d8155f4148e1afe5c7c9c99553bf85fcab14 /t/aggregate-results.sh
parentMerge branch 'jc/diff-merge-base-multi' (diff)
parentMERGE_RR is in .git, not .git/rr-cache (diff)
downloadtgif-4bd874c8f30d55b6189dacf1d769855ed2df4299.tar.xz
Merge branch 'js/merge-rr-fix'
* js/merge-rr-fix: MERGE_RR is in .git, not .git/rr-cache
Diffstat (limited to 't/aggregate-results.sh')
0 files changed, 0 insertions, 0 deletions