From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Apr 2012 17:35:07 +0000 (-0700)
Subject: Merge branch 'jk/add-p-skip-conflicts' into maint
X-Git-Tag: v1.7.10.1~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4579a0547cc558bd0e341adb77897e1f2f331f78;p=git.git

Merge branch 'jk/add-p-skip-conflicts' into maint

"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
---

4579a0547cc558bd0e341adb77897e1f2f331f78