mergetools / gvimdiff3on commit Merge branch 'sg/core-filemode-doc-typofix' into maint (b8a4652)
   1. "$MERGE_TOOLS_DIR/vimdiff"