summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-10 10:33:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-10 10:33:43 -0800
commit2b2849765f2a0c712e5539badfcbf8ec0639ebec (patch)
treeda884d63bb005adba43b74529744b51b6ebd903e /builtin/merge-recursive.c
parentMerge branch 'rr/completion-branch-config' (diff)
parentuser-manual: improve html and pdf formatting (diff)
downloadtgif-2b2849765f2a0c712e5539badfcbf8ec0639ebec.tar.xz
Merge branch 'ta/format-user-manual-as-an-article'
Update the way the user-manual is formatted via AsciiDoc to save trees. * ta/format-user-manual-as-an-article: user-manual: improve html and pdf formatting
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions