summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-15 11:32:57 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-15 11:32:57 -0800
commitabf411e28d9df669b0e690578a1eb95c0bd29847 (patch)
tree765c8424399d79902351f3fefc68b4dcfc57b53b /merge-recursive.h
parentMerge branch 'maint-1.6.5' into maint-1.6.6 (diff)
parentGit 1.6.5.9 (diff)
downloadtgif-abf411e28d9df669b0e690578a1eb95c0bd29847.tar.xz
Git 1.6.6.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions