mergetools / vimdiff2on commit Merge branch 'ws/request-pull-code-cleanup' (71db0cf)
   1. "$MERGE_TOOLS_DIR/vimdiff"