mergetools / vimdiff2on commit Merge branch 'rs/commit-pptr-simplify' (2f445c1)
   1. "$MERGE_TOOLS_DIR/vimdiff"