summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-12-03 11:41:33 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-12-03 11:41:33 -0800
commit144d84644fd3a2d0dc7be60766411970e82faf55 (patch)
treeca7216def53c6fcfecc5267b65262b4a591790e0 /builtin/merge-recursive.c
parentMerge branch 'tb/doc-fetch-pack-url' (diff)
parentcontrib: typofixes (diff)
downloadtgif-144d84644fd3a2d0dc7be60766411970e82faf55.tar.xz
Merge branch 'mi/typofixes'
* mi/typofixes: contrib: typofixes Documentation/technical/http-protocol.txt: typofixes typofixes: fix misspelt comments
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions