is there any way to tell git to ignore merging certain files? I've got files that have the same name in each directory. but I can't merge them with an editor... it'd be easier to be able to ignore them with git mergetool... and handle them manually. -- Caleb Cushing http://xenoterracide.blogspot.com -- 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
