From: Junio C Hamano 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: https://git.lorimer.id.au/gitweb.git/diff_plain/3c524002d67471f8ef5455ef0e5ce3e6fc846b32 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