summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-03-21 11:30:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-21 11:30:12 -0700
commitbfaab4885ad235dd7612eff46923a881f0b4b21d (patch)
treead82a5e22155f8b35836848123d70cd577fd8ce4 /Documentation/merge-strategies.txt
parentMerge branch 'rj/http-code-cleanup' (diff)
parentRelNotes: add details on Perl module changes (diff)
downloadtgif-bfaab4885ad235dd7612eff46923a881f0b4b21d.tar.xz
Merge branch 'tz/relnotes-1.7-on-perl'
* tz/relnotes-1.7-on-perl: RelNotes: add details on Perl module changes
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions