mergetools / vimdiff2on commit Merge branch 'en/dirty-merge-fixes' (c18ac30)
   1. "$MERGE_TOOLS_DIR/vimdiff"