Merge branch 'jc/maint-apply-report-offset'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:02 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 21:22:02 +0000 (14:22 -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