mergetools / vimdiff3on commit Merge branch 'nd/archive-pathspec' (b2c45f5)
   1. "$MERGE_TOOLS_DIR/vimdiff"