ws

MichaelChirico · web-flow · commit fc67d724981f · 2025-06-09T13:34:19.000-07:00
diff --git a/R/merge.R b/R/merge.R
@@ -98,7 +98,7 @@ merge.data.table = function(x, y, by = NULL, by.x = NULL, by.y = NULL, all = FAL
   }
 
   dt = tryCatch(
-      y[x, nomatch=if (all.x) NA else NULL, on=by, allow.cartesian=allow.cartesian],
+    y[x, nomatch=if (all.x) NA else NULL, on=by, allow.cartesian=allow.cartesian],
     dt_bmerge_incompatible_type_error = function(e) {
       x_part_col_name = e$bmerge_i_arg_col_name
       x_part_type     = e$bmerge_i_arg_type

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ merge.data.table = function(x, y, by = NULL, by.x = NULL, by.y = NULL, all = FAL`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`dt = tryCatch(`
`101`		`- y[x, nomatch=if (all.x) NA else NULL, on=by, allow.cartesian=allow.cartesian],`
	`101`	`+ y[x, nomatch=if (all.x) NA else NULL, on=by, allow.cartesian=allow.cartesian],`
`102`	`102`	`dt_bmerge_incompatible_type_error = function(e) {`
`103`	`103`	`x_part_col_name = e$bmerge_i_arg_col_name`
`104`	`104`	`x_part_type = e$bmerge_i_arg_type`