mergetools / gvimdiff2on commit Merge branch 'jc/add-2.0-delete-default' (early part) (561954b)
   1. "$MERGE_TOOLS_DIR/vimdiff"