summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-02-16 22:45:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-16 22:45:14 -0800
commit6d816301cd53e54af3398b634d47588a6f184be4 (patch)
tree946bbec83ad85736d3e4c25406d510ac4841e256 /merge-recursive.c
parentMerge branch 'maint' (diff)
parentTypofixes outside documentation area (diff)
downloadtgif-6d816301cd53e54af3398b634d47588a6f184be4.tar.xz
Merge branch 'jc/typo'
* jc/typo: Typofixes outside documentation area
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions