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.
Paolo
--
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