firstly my patch sucks, and I know it. but hopefully it'll give some idea of what I'm trying to do and someone can implement it properly. basically there are some files, that I can't merge with git, but I need to merge other files before I can fix those and I like to use mergetool, so I want a way to skip the files I'm not going to be able to merge. -- Caleb Cushing http://xenoterracide.blogspot.com
Attachment:
0001-preliminary-merge-skip-abort-patch.patch
Description: Binary data
