summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-22 20:37:42 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-22 20:37:42 -0800
commit2b1965863bb2beb4665749daaf7a5bdfd8e2eb2b (patch)
tree535b45cccba4e9c20039c5a0bc0fcb52e7126cb8 /merge-recursive.h
parentMerge branch 'as/doc-for-devs' into maint (diff)
parentRemove misleading date from api-index-skel.txt (diff)
downloadtgif-2b1965863bb2beb4665749daaf7a5bdfd8e2eb2b.tar.xz
Merge branch 'ta/api-index-doc' into maint
* ta/api-index-doc: Remove misleading date from api-index-skel.txt
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions