Manage binary content merge

Currently, the diff doesnt work with binary content.
It should hide the file but allow to manage the merge.
There are also problems in the commit history: the binary content is shown.