mergetools / gvimdiffon commit Merge branch 'mb/reword-autocomplete-message' into maint (cf77911)
   1. "$MERGE_TOOLS_DIR/vimdiff"