Merge branch 'pw/add-p-recount'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:37 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:37 +0000 (15:25 -0700)
"git checkout -p" needs to selectively apply a patch in reverse,
which did not work well.

* pw/add-p-recount:
add -p: fix checkout -p with pathological context

1  2 
git-add--interactive.perl
t/t3701-add-interactive.sh
Simple merge
Simple merge