summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-13 11:26:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-13 11:30:25 -0700
commit79ed43c28f626a4e805f350a77c54968b59be6e9 (patch)
tree927167995f652c8ce365bd32fe9ed1aead0f3dcd /merge-recursive.h
parentMerge branch 'jk/big-and-future-archive-tar' (diff)
downloadtgif-79ed43c28f626a4e805f350a77c54968b59be6e9.tar.xz
Fifth batch of topics for 2.10
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions