From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 19:43:36 +0000 (-0700)
Subject: Merge branch 'jk/add-p-skip-conflicts'
X-Git-Tag: v1.7.11-rc0~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c524002d67471f8ef5455ef0e5ce3e6fc846b32;p=thirdparty%2Fgit.git

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

Excludes conflicted paths from "add -p" processing, as it is not prepared
to handle them.

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

3c524002d67471f8ef5455ef0e5ce3e6fc846b32