Hmm, with that patch I get get this instead: mv: cannot stat `.merge_file_Yg2IIs': No such file or directory mv: cannot stat `.merge_file_4xGT8t': No such file or directory mv: cannot stat `.merge_file_4XAVAt': No such file or directory Which seems to be a problem in checkout_staged_file() The .merge_file_* files exists in the repository root (the dir with .git) but I don't know how to fix that.. Thanks! // Jonas -- 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
