summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Miklos Vajna <vmiklos@frugalware.org>2009-01-15 01:33:19 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-14 17:00:00 -0800
commit8dca683346fcd17684eb6646c486461cae38241e (patch)
treebf5c4c78076810f8b8e15a94f6455b9fbe7e912c /Documentation/merge-config.txt
parentMerge branch 'maint-1.6.0' into maint (diff)
downloadtgif-8dca683346fcd17684eb6646c486461cae38241e.tar.xz
Make t3411 executable
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions