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)
* js/apply-build-ancestor:
apply: get rid of --index-info in favor of --build-fake-ancestor

1  2 
git-am.sh
diff --cc git-am.sh
Simple merge