mergetools / gvimdiff3on commit Merge branch 'jk/archive-zip-userdiff-config' (0f650e1)
   1. "$MERGE_TOOLS_DIR/vimdiff"