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