bindiff: added capability to merge differing files