summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-26 13:28:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-26 13:28:24 -0700
commit7777322816a31edff4fb9f429847d11f8974f264 (patch)
tree3a058d510b271baf236fa35e4f498b47cd992a89 /Documentation/merge-config.txt
parentGit 2.9-rc0 (diff)
parentStart preparing for 2.8.4 (diff)
downloadtgif-7777322816a31edff4fb9f429847d11f8974f264.tar.xz
Sync with maint
* maint: Start preparing for 2.8.4 archive-tar: convert snprintf to xsnprintf
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions