mergetools / vimdiff3on commit Merge branch 'nd/config-misc-fixes' (4208723)
   1. "$MERGE_TOOLS_DIR/vimdiff"