mergetools / vimdiff3on commit Merge branch 'jc/makefile-redirection-stderr' into maint (98eef48)
   1. "$MERGE_TOOLS_DIR/vimdiff"