summaryrefslogtreecommitdiff
path: root/mergesort.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-22 20:36:42 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-22 20:36:42 -0800
commitccc3ae799c61ac9ea812396de2e28bd3c9ac2060 (patch)
tree58809fa2c787e45ff9376e99e5c683f92874518e /mergesort.h
parentMerge branch 'ta/doc-cleanup' into maint (diff)
parentcontrib: update stats/mailmap script (diff)
downloadtgif-ccc3ae799c61ac9ea812396de2e28bd3c9ac2060.tar.xz
Merge branch 'jk/mailmap-cleanup' into maint
* jk/mailmap-cleanup: contrib: update stats/mailmap script .mailmap: normalize emails for Linus Torvalds .mailmap: normalize emails for Jeff King .mailmap: fix broken entry for Martin Langhoff .mailmap: match up some obvious names/emails
Diffstat (limited to 'mergesort.h')
0 files changed, 0 insertions, 0 deletions