cannot apply binary patch to *** without full index line

SeyZ / baboon

Detect source code merge conflicts in realtime. Simply get rid of merge hells.

http://baboon-project.org

120 stars 9 forks source link

Closed SeyZ closed 12 years ago

SeyZ commented 12 years ago

Fixed error like that:

Conflict detected with seyz@baboon-project.org.
> error: cannot apply binary patch to 'public/apple-touch-icon.png' without full index line

To reproduce the bug, remove a binary file.