mergetools / gvimdiffon commit Merge branch 'jk/mv-submodules-fix' into maint (3097b68)
   1. "$MERGE_TOOLS_DIR/vimdiff"