mergetools / vimdiff2on commit Merge branch 'jc/push-2.0-default-to-simple' (early part) (54a3c67)
   1. "$MERGE_TOOLS_DIR/vimdiff"