Hi, I discovered that "git-am --resolved --3way" (in 1.3.1) and "git-rebase --continue" (in 1.4.2.rc1.ge7a0) do not correctly capture hand resolved files into .git/rr-cache. In worst case I got (with 1.3.1), afaict, the postimage was incorrect including also all patches successfully applied after the git-am --resolved --3way up to until the point where next conflict occurred. To circumvent this, I can use git-rerere directly but I remember that its manpage states that one should never have to do so. I'm I missing something or is this a problem in git-rebase (or possibly in git-am)? -- i. ps. I'm not subscribed, so please cc me. - : 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