From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Aug 2011 23:00:32 +0000 (-0700)
Subject: Merge branch 'di/fast-import-doc'
X-Git-Tag: v1.7.7-rc0~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1d21112a946b338feaa4df4183ea26ac5d1353d0;p=git.git

Merge branch 'di/fast-import-doc'

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

1d21112a946b338feaa4df4183ea26ac5d1353d0