Code

Merge branch 'jc/maint-apply-report-offset' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:20:19 +0000 (16:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:20:19 +0000 (16:20 -0700)
* jc/maint-apply-report-offset:
  apply -v: show offset count when patch did not apply exactly

1  2 
builtin/apply.c

diff --cc builtin/apply.c
Simple merge