mergetools / vimdiff3on commit Merge branch 'sg/clean-nested-repo-with-ignored' (026428c)
   1. "$MERGE_TOOLS_DIR/vimdiff"