From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Sep 2010 15:54:01 +0000 (-0700)
Subject: Merge branch 'en/d-f-conflict-fix'
X-Git-Tag: v1.7.3-rc1~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f44723d1a2c6a97306a7160deeab621e08bea7a;p=git.git

Merge branch 'en/d-f-conflict-fix'

* en/d-f-conflict-fix:
  fast-export: ensure that a renamed file is printed after all references
---

9f44723d1a2c6a97306a7160deeab621e08bea7a