mergetools / gvimdiff2on commit Merge branch 'jc/push-2.0-default-to-simple' (009055f)
   1. "$MERGE_TOOLS_DIR/vimdiff"