Merge branch 'jc/bindiff'

* jc/bindiff:
improve base85 generated assembly code
binary diff and apply: testsuite.
binary diff: further updates.
binary patch.

diff --cc apply.c
Simple merge

diff --cc diff.c
Simple merge