Merge branch 'fc/apply-p2-get-header-name'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:33 +0000 (29 17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:33 +0000 (29 17:52 -0800)
* fc/apply-p2-get-header-name:
  test: git-apply -p2 rename/chmod only
  Fix git-apply with -p greater than 1

1  2 
builtin/apply.c

diff --cc builtin/apply.c
Simple merge