summaryrefslogtreecommitdiff
path: root/t/t6015-rev-list-show-all-parents.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-11-18 11:14:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-18 11:14:00 -0800
commit79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f (patch)
tree9ae710ca2bcb33eca92ebcb1fff61b98d4e08194 /t/t6015-rev-list-show-all-parents.sh
parentMerge branch 'jn/maint-notes-avoid-va-args' into maint (diff)
parentmailmap: xcalloc mailmap_info (diff)
downloadtgif-79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f.tar.xz
Merge branch 'ml/mailmap' into maint
* ml/mailmap: mailmap: xcalloc mailmap_info Conflicts: mailmap.c
Diffstat (limited to 't/t6015-rev-list-show-all-parents.sh')
0 files changed, 0 insertions, 0 deletions