tree 9a88d0bb4eb0d9c37debb66303225f5e7d780065
parent 121f71f0da1bc9a4e1e96be2c3e683191a82a354
parent 43bc2302706af6a3bb9266eea1bcb7071c54c8c6
author Junio C Hamano <gitster@pobox.com> 1339966803 -0700
committer Junio C Hamano <gitster@pobox.com> 1339966803 -0700

Merge branch 'js/maint-fast-export-mark-error' into maint

"git fast-export" did not give a readable error message when the same
mark erroneously appeared twice in the --import-marks input.