mergetools / vimdiff3on commit Merge branch 'js/windows-dotgit' (bfc99b6)
   1. "$MERGE_TOOLS_DIR/vimdiff"