mergetools / gvimdiffon commit Merge branch 'jc/am-i-v-fix' into maint (28eec80)
   1. "$MERGE_TOOLS_DIR/vimdiff"