mergetools / gvimdiffon commit Merge branch 'vv/merge-squash-with-explicit-commit' into maint (33f2790)
   1. "$MERGE_TOOLS_DIR/vimdiff"