Merge branch 'js/apply-recount'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:39 +0000 (16:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:39 +0000 (16:22 -0700)
* js/apply-recount:
  Allow git-apply to recount the lines in a hunk (AKA recountdiff)

1  2 
builtin-apply.c

diff --cc builtin-apply.c
Simple merge