summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-02-15 14:58:25 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-02-15 14:58:25 -0800
commitd09b6927978d70ca53126e80d0dc8a070cc06635 (patch)
treed329145ec5e9376c132c1e0bdc7c5e755311f02a /Documentation/merge-strategies.txt
parentMerge branch 'tg/stash-doc-cleanup' (diff)
downloadtgif-d09b6927978d70ca53126e80d0dc8a070cc06635.tar.xz
A bit more for -rc2
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions