From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Sep 2007 04:16:33 +0000 (-0700)
Subject: Merge branch 'js/apply-build-ancestor'
X-Git-Tag: v1.5.4-rc0~422
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52d5bc9a161f839b78ec06c25736d09703fda802;p=git.git

Merge branch 'js/apply-build-ancestor'

* js/apply-build-ancestor:
  apply: get rid of --index-info in favor of --build-fake-ancestor
---

52d5bc9a161f839b78ec06c25736d09703fda802