summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-03 15:18:22 -0800
committerJunio C Hamano <gitster@pobox.com>2015-11-03 15:18:22 -0800
commitc29024e5d1ad88cf45ef66b175966a0ba44a0490 (patch)
tree03341b430fa2c5b5755cbf9feb635d3aacfd6751 /merge-recursive.c
parentc3c592ef95ee21833e2214fb9068889dcac220c9 (diff)
downloadgit-c29024e5d1ad88cf45ef66b175966a0ba44a0490.tar.gz
Tenth batch for 2.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions