Merge early part of branch 'jc/diff-apply-patch'
commit17250ac172b44acd3bdf4ddffb4ed6d915b69246
authorJunio C Hamano <junkio@cox.net>
Thu, 19 Oct 2006 05:08:46 +0000 (18 22:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 19 Oct 2006 05:08:46 +0000 (18 22:08 -0700)
tree1b78b659b0c4b807e44e77a5efb0623bb57cda85
parentf73a5e897609c895aa6c10f7a89428d1749d37ce
parentce74618d95088d99de53fb691f361da05932f705
Merge early part of branch 'jc/diff-apply-patch'
builtin-apply.c