mergetools / gvimdiffon commit Merge branch 'jl/commit-v-strip-marker' into maint (a118bee)
   1. "$MERGE_TOOLS_DIR/vimdiff"