mergetool ignore
From: Caleb Cushing <hidden>
Date: 2016-06-15 22:45:58
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