summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-02-15 14:56:40 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-02-15 14:56:40 -0800
commit8c00b7e583bc69e1e0a4f2fcd5a744c52fba24f0 (patch)
treee65a598650b20bf7ecf99d3e8af95a6a8f3cd761 /Documentation/merge-strategies.txt
parentMerge branch 'sb/doc-unify-bottom' (diff)
parentdocs/gitremote-helpers: fix unbalanced quotes (diff)
downloadtgif-8c00b7e583bc69e1e0a4f2fcd5a744c52fba24f0.tar.xz
Merge branch 'jk/doc-remote-helpers-markup-fix'
Doc markup fix. * jk/doc-remote-helpers-markup-fix: docs/gitremote-helpers: fix unbalanced quotes
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions