mergetools / vimdiff2on commit Merge branch 'rs/code-cleaning' (1fc8345)
   1. "$MERGE_TOOLS_DIR/vimdiff"