From: Martin von Zweigbergk Date: Wed, 16 Feb 2011 10:47:43 GMT Subject: [PATCH v3 0/2] mergetool: don't skip modify/remove conflicts Message-ID: <1297853265-18993-1-git-send-email-martin.von.zweigbergk@gmail.com> In-Reply-To: <7vbp2dnjkt.fsf@alter.siamese.dyndns.org> Third round. Reorganized the patches a bit as suggested by Junio. The first patch now contains all the changes to rerere and the second one only makes mergetool call 'rerere remaining'. The only tiny change to the end result is the removal of a blank line. The series applies on top of master. Junio C Hamano (1): rerere "remaining" Martin von Zweigbergk (1): mergetool: don't skip modify/remove conflicts builtin/rerere.c | 17 +++++++++-- git-mergetool.sh | 2 +- rerere.c | 79 +++++++++++++++++++++++++++++++++++++++++++------ rerere.h | 8 +++++ t/t7610-mergetool.sh | 40 +++++++++++++++++++++---- 5 files changed, 126 insertions(+), 20 deletions(-) -- 1.7.4.rc2.33.g8a14f