mergetools / vimdiff2on commit Merge branch 'rs/pop-commit' (0692a6c)
   1. "$MERGE_TOOLS_DIR/vimdiff"