Fix check-merge-conflict against binary files

Browse source

...

This commit is contained in:

Anthony Sottile 2016-05-26 11:20:32 -07:00

parent adbb569fe9

commit 4a01f64c8f

3 changed files with 16 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

testing/resources/img1.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 843 B