Better handling of "Binary files differ" and git index lines

[sourcefrog]

With this changed we can correctly parse and, to some extent roundtrip, diffs like this:

diff --git a/bin b/bin
index 4805bf6..e807873 100644
Binary files a/bin and b/bin differ

This might conflict with #5 so I'll wait until that merges.