mergetools / gvimdiff3on commit Merge branch 'maint-2.5' into maint-2.6 (ab37a18)
   1. "$MERGE_TOOLS_DIR/vimdiff"