summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-07 11:32:56 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-07 11:32:56 +0900
commitcb3ec6f4efece2c8ed3bd443f0450e2a33b27ac5 (patch)
treef4f3a8a1d0c529e0edca15ae185a9a8d241c5620 /Documentation/merge-options.txt
parentMerge branch 'jk/list-objects-optim-wo-trees' (diff)
parentdoc: minor formatting fix (diff)
downloadtgif-cb3ec6f4efece2c8ed3bd443f0450e2a33b27ac5.tar.xz
Merge branch 'cs/pretty-formats-doc-typofix'
Doc fix. * cs/pretty-formats-doc-typofix: doc: minor formatting fix
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions