> If you want to be given a chance to edit the result before the merge > commit, you probably want 'git merge --no-commit'. That's the closest to what I need to do... unfortunately it's not what I need to do. Apparently I'll have to do a vimdiff outside of git since git doesn't appear to be capable of doing what I need it to do. -- Caleb Cushing -- 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
