Merge branch 'ma/fast-export-skip-merge-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:33 +0000 (15:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:33 +0000 (15:59 +0900)
commitad3207e...ff019060e4f634a5455aa0ae248e3a7a
tree8a5d3a7...fb087a491ecb6d4db68078144e4df495copy hash to clipboard (tree)
parentdf7abe3...ef01d7fa45114e4eb6cabf06f688b260copy hash to clipboard (diff)
parentbe011bb...001facf71bd636494eb253aa5151d26acopy hash to clipboard (diff)
builtin/fast-export.c
t/t9350-fast-export.sh