From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 May 2018 06:59:33 +0000 (+0900)
Subject: Merge branch 'ma/fast-export-skip-merge-fix'
X-Git-Tag: v2.18.0-rc0~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ad3207e6ff019060e4f634a5455aa0ae248e3a7a?ds=inline;hp=--cc

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
---

ad3207e6ff019060e4f634a5455aa0ae248e3a7a