mergetools / gvimdiffon commit Merge branch 'jk/t5000-gzip-simplify' (aa13132)
   1. "$MERGE_TOOLS_DIR/vimdiff"