mergetools / vimdiff2on commit Merge branch 'nd/branch-error-cases' (42e129f)
   1. "$MERGE_TOOLS_DIR/vimdiff"