mergetools / gvimdiffon commit Merge branch 'maint-2.7' into maint-2.8 (a8d93d1)
   1. "$MERGE_TOOLS_DIR/vimdiff"