summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-22 14:18:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-22 14:18:05 -0700
commit5402b1352f5181247405fbff1887008a0cb3b04a (patch)
treeac594cd58472d7fe88b2981bd5315cfb41ecd249 /Documentation/merge-config.txt
parentMerge branch 'rs/strbuf-addftime-zZ' (diff)
downloadtgif-5402b1352f5181247405fbff1887008a0cb3b04a.tar.xz
Tenth batch for 2.14
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions