Trying again. I hope it looks better this time. The second patch could be squashed with the first one. This applies on top of jc/rerere-remaining. Martin von Zweigbergk (2): mergetool: don't skip modify/remove conflicts rerere: factor out common conflict search code builtin/rerere.c | 21 +++++----- git-mergetool.sh | 2 +- rerere.c | 109 +++++++++++++++++++++++++++++--------------------- rerere.h | 8 ++++ t/t7610-mergetool.sh | 40 +++++++++++++++--- 5 files changed, 117 insertions(+), 63 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