summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-07 11:25:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-07 11:25:22 -0700
commit0ce986446163b37c7f663ce7a408e7f94c31ba63 (patch)
tree5235422b9e88d2df56e85c9ebc3588fc90baff4e /merge-recursive.c
parentMerge branch 'nd/branch-v-alignment' (diff)
downloadtgif-0ce986446163b37c7f663ce7a408e7f94c31ba63.tar.xz
The fourth batch for 1.8.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions