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)
commitad3207e6ff019060e4f634a5455aa0ae248e3a7a
tree8a5d3a7ffb087a491ecb6d4db68078144e4df495
parentdf7abe3fef01d7fa45114e4eb6cabf06f688b260
parentbe011bbe001facf71bd636494eb253aa5151d26a
Merge branch 'ma/fast-export-skip-merge-fix'

"git fast-export" had a regression in v2.15.0 era where it skipped
some merge commits in certain cases, which has been corrected.

* ma/fast-export-skip-merge-fix:
  fast-export: fix regression skipping some merge-commits
builtin/fast-export.c
t/t9350-fast-export.sh