mergetools / vimdiff2on commit tests: teach the test-tool to generate NUL bytes and use it (d5cfd14)
   1. "$MERGE_TOOLS_DIR/vimdiff"