git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Sun, 17 Jun 2012 21:00:03 +0000 (14:00 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sun, 17 Jun 2012 21:00:03 +0000 (14:00 -0700)
commit	ca4effd8bce5e0dfce7ce1425074475c8643b7f0
tree	9a88d0bb4eb0d9c37debb66303225f5e7d780065	tree \| snapshot
parent	121f71f0da1bc9a4e1e96be2c3e683191a82a354	commit \| diff
parent	43bc2302706af6a3bb9266eea1bcb7071c54c8c6	commit \| diff

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.