I have some problems ignoring the diff calculation/display for certain types of file.
My root .gitattributes contains:
When i type "git diff" in a shell i get what i want :
Binary files a/.../totopouet.megacool and b/.../totopouet.megacool differ
That's good, but i guess Sublime Merge ignore the .gitattribute file because it tries (and manage to but after some long minutes waiting) to calculate the diff on my huge txt.megacool file.
This impact greatly my experience, since i have to wait to see other changes/ diff in other file, because SMerge it taking 25% Cpu calculating the huge-not wanted diff.
I had those same files before, and i did not remember it "hanging" this way, so maybe this diff calculation blocking other things is new with build 1103.