mergetools / vimdiff3on commit Revert "Merge branch 'en/rename-directory-detection'" (8b026ed)
   1. "$MERGE_TOOLS_DIR/vimdiff"