Merge branch 'js/apply-build-ancestor'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 04:16:33 +0000 (21:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 04:16:33 +0000 (21:16 -0700)
commit52d5bc9a161f839b78ec06c25736d09703fda802
tree8ef92ac1a031de4929da08ce29cc878d6525be31
parent4f337e24662f07513fd6e8388f27f13dbe44cadc
parent7a98869935a3682b5ff9679c92bf9bc12f87d8c5
Merge branch 'js/apply-build-ancestor'

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