summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-22 16:28:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-22 16:28:14 -0800
commit82f05d5dd7ec54c4cd30f016c4380b21245e0d63 (patch)
treec81b46f0c28579c06b886074149e9762921a3ddc /Documentation/merge-config.txt
parentMerge branch 'tr/maint-merge-ours-clarification' (early part) (diff)
parentCheck the format of more printf-type functions (diff)
downloadtgif-82f05d5dd7ec54c4cd30f016c4380b21245e0d63.tar.xz
Merge branch 'tc/format-attribute'
* tc/format-attribute: Check the format of more printf-type functions
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions