summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-04 19:40:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-04 19:40:37 (GMT)
commit230ce07d134f597a8107d3ed5d76d212ff90db70 (patch)
tree9f9de19330fc4c7edcee3b286ef68d1a7561284c /Documentation/technical/trivial-merge.txt
parent4384e3cde2ce8ecd194202e171ae16333d241326 (diff)
parent7234152e66e52c7601789f6de822bb39590f0595 (diff)
downloadgit-230ce07d134f597a8107d3ed5d76d212ff90db70.zip
git-230ce07d134f597a8107d3ed5d76d212ff90db70.tar.gz
git-230ce07d134f597a8107d3ed5d76d212ff90db70.tar.bz2
Merge tag 'v2.13.5' into maint
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions