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
commit3e23116d1f77f73714c67fe546d879f4bbb633a0 (patch)
treebbab8afacd92b03bd034d50c91b646f1d9a3f3e2 /Documentation/merge-strategies.txt
parentMerge branch 'jk/doc-remote-helpers-markup-fix' (diff)
parentdocs/git-submodule: fix unbalanced quote (diff)
downloadtgif-3e23116d1f77f73714c67fe546d879f4bbb633a0.tar.xz
Merge branch 'jk/doc-submodule-markup-fix'
Doc markup fix. * jk/doc-submodule-markup-fix: docs/git-submodule: fix unbalanced quote
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions