mergetools / gvimdiff3on commit Sync with maint (bbcefff)
   1. "$MERGE_TOOLS_DIR/vimdiff"