David Aguilar <davvid@xxxxxxxxx> writes: > Here's what we'd need in order to improve rerere and mergetool > interaction: the ability to answer the question, "has this file been > rerere merged?" I do not quite understand why the user _runs_ mergetool on a file that has been already merged; isn't it an option not to do so in the first place? Having said that. I think you can use the fact that: - "ls-files -u" will list paths with conflicts; and - "rerere status" won't mention the ones that have been autoresolved if rerere is in effect (check for presense of .git/MERGE_RR). -- 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