summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-08-04 14:05:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-08-04 14:05:06 -0700
commit7b69fcb181941fafda99a5ffd25cea1f685d7e70 (patch)
tree4a386749843562df47ca9bc8e0c42e5e92ed7ba7 /merge-recursive.c
parentMerge branch 'tf/maint-doc-push' (diff)
downloadtgif-7b69fcb181941fafda99a5ffd25cea1f685d7e70.tar.xz
Git 2.1.0-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions