Andreas Ericsson <ae@xxxxxx> writes: >>> or check which merge- conflicts you've already resolved, >> >> At least bzr and baz have this kind of conflict management. It's just >> a separate file, containing the list of unresolved conflicts. > > Can you check them against any revision you want? If so, I'm > impressed :) If you mean s/check/diff/, not in a simple way, no. Otherwise, I don't understand what you mean by "check merge-conflicts you've already resolved against any revision". -- Matthieu - 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
