summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-09 12:04:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-09 12:04:34 -0700
commit0bc85abb7aa9b24b093253018801a0fb43d01122 (patch)
tree33cd122d8f79160cf99db6467b17d704baeec24f /merge-recursive.c
parentMerge branch 'jl/nor-or-nand-and' into maint (diff)
downloadtgif-0bc85abb7aa9b24b093253018801a0fb43d01122.tar.xz
Git 1.9.2
The second maintenance release for Git 1.9; contains all the fixes that are scheduled to appear in Git 2.0. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions