From: Caleb Cushing <xenoterracide@gmail.com>
Date: Fri, 16 Jan 2009 20:19:30 GMT
Subject: mergetool ignore
Message-ID: <81bfc67a0901161219l23877df8xf1707aaf9e83bcb3@mail.gmail.com>

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