mergetools / vimdiff2on commit Merge branch 'nd/commit-p-doc' (af9a70c)
   1. "$MERGE_TOOLS_DIR/vimdiff"