Merge branch 'jk/add-p-skip-conflicts' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:07 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:07 +0000 (10:35 -0700)
"git add -p" is not designed to deal with unmerged paths but did
not exclude them and tried to apply funny patches only to fail.

By Jeff King
* jk/add-p-skip-conflicts:
add--interactive: ignore unmerged entries in patch mode

Trivial merge