summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-08-24 12:33:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-24 12:33:31 -0700
commitb52183179bb0a97ea4d91d1248aca303d8e8f892 (patch)
treeb8146cedc86f38ab288cdd2d1a625196306ede83 /merge-recursive.c
parentMerge branch 'mv/pull-r-for-rebase' into maint-1.7.11 (diff)
downloadtgif-b52183179bb0a97ea4d91d1248aca303d8e8f892.tar.xz
Prepare for 1.7.11.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions