# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1258969810 -3600
# Node ID 870a69bac55cbaece2c57c285b63796b346cef45
# Parent  02d59b67632ff2718c666438979e1785bce5b3d0
fix test in merge

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-23  Jaroslav Hajek  <highegg@gmail.com>
+
+	* data.cc (Fmerge): Add missing parentheses.
+
 2009-11-23  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov-complex.h (octave_complex::bool_value,
diff --git a/src/data.cc b/src/data.cc
--- a/src/data.cc
+++ b/src/data.cc
@@ -6491,7 +6491,7 @@
   int nargin = args.length ();
   octave_value retval;
 
-  if (nargin == 3 && args(0).is_bool_type () || args(0).is_numeric_type ())
+  if (nargin == 3 && (args(0).is_bool_type () || args(0).is_numeric_type ()))
     {
       octave_value mask_val = args(0);