mergetools / gvimdiff2on commit Merge branch 'jk/empty-archive' (63868f6)
   1. "$MERGE_TOOLS_DIR/vimdiff"