summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-06 10:51:30 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-06 10:51:30 -0700
commite38f2a88e56796d13c2a31192bc78ed930b89e54 (patch)
tree78368efc3e0f8f7785a3a4d91b55963d08768ab9 /merge-recursive.c
parentMerge branch 'jk/maint-remote-mirror-safer' (diff)
parentGit 1.7.4.4 (diff)
downloadtgif-e38f2a88e56796d13c2a31192bc78ed930b89e54.tar.xz
Sync with 1.7.4.4
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions