Paolo Bonzini <bonzini@xxxxxxx> writes: > On 12/11/2009 12:20 PM, Jakub Narebski wrote: >>> > 2 and 3 are easy (cheap) to recreate from HEAD and MERGE_HEAD, 1 is not. >>> > I guess that's why --unresolve doesn't even attempt to do anything with 1. >> But then "git update-index --unresolve<file>" is next to useless. > > Only "next to". It can still be useful if you added a file before > editing it, so you left in the conflict markers. To be fair, these need to be judged within their context, and then get updated to today's reality. "diff --cc" was merely a relatively new curiosity that allows a different view into a conflicted merge (it was still cooking in 'next'). The primary ways to inspect a conflict were "diff --theirs" and "diff --ours"; repopulating stages #2 and #3 was sufficient for them. -- 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