mergetools / vimdiff2on commit Merge branch 'nd/clean-preserve-errno-in-warning' (b4ca5d0)
   1. "$MERGE_TOOLS_DIR/vimdiff"