Merge branch 'di/fast-import-doc'

* di/fast-import-doc: doc/fast-import: document feature import-marks-if-exists

Junio C Hamano committed Aug 25, 2011 at 16:00 UTC 1d21112a946b338feaa4df4183ea26ac5d1353d0

No changes.