summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-26 13:16:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-26 13:16:51 -0700
commitadbcfe6547fda8fe66618355a8a2031ac27d1a90 (patch)
tree968777634dce3d3831dfbcdfea6e1893a754f44e /Documentation/git-merge-one-file.txt
parentGit 2.8.3 (diff)
parentMerge branch 'jk/war-on-sprintf' into maint-2.7 (diff)
downloadtgif-adbcfe6547fda8fe66618355a8a2031ac27d1a90.tar.xz
Merge branch 'maint-2.7' into maint
* maint-2.7: archive-tar: convert snprintf to xsnprintf
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions