> I know I'm a bit late... I just got the first impression of the > consequences of this patch. And I don't like them. > > I did a merge with conflicts, and the result was resolved to my liking by > rerere. (And even if rerere did not kick in - I'd have resolved the > conflicts in an external editor anyway.) Now I want to stage the file - > but I can't. :-( > > No, I can't "Run merge tool", because I don't have one. > No, I don't want to "Use remote version" or "Use local version" or "Revert > to base". > Yes, I want to stage the file _as_is_!! > > Please help. I'll make a patch today to add a new item to the popup menu. I don't use rerere much, so I didn't notice this problem myself until yesterday evening. Alexander -- 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
