Merge branch 'fc/fast-import-broken-marks-file'

"git fast-import --export-marks" would overwrite the existing marks file even when it makes a dump from its custom die routine. Prevent it from doing so when we have an import-marks file but haven't finished reading it. * fc/fast-import-broken-marks-file: fast-import: do not truncate exported marks file

Junio C Hamano committed May 31, 2016 at 12:40 UTC bc4b9247df12e668b93cca85d6a5415e6b007368

No changes.