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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html