# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1258724618 -3600
# Node ID 6867676107f3a5de9f8abfa505a682af1e9abdcd
# Parent  131d8c70920afc5decb681f4358b633721acaba6
fix merge

diff -r 131d8c70920a -r 6867676107f3 src/ChangeLog
--- a/src/ChangeLog	Sun Nov 22 16:47:39 2009 -0500
+++ b/src/ChangeLog	Fri Nov 20 14:43:38 2009 +0100
@@ -1,3 +1,7 @@
+2009-11-20  Jaroslav Hajek  <highegg@gmail.com>
+
+	* data.cc (Fmerge): Correct query for logical masks.
+
 2009-11-20  Jaroslav Hajek  <highegg@gmail.com>
 
 	* utils.cc (dims_to_numel): Fallback to index_vector query for
diff -r 131d8c70920a -r 6867676107f3 src/data.cc
--- a/src/data.cc	Sun Nov 22 16:47:39 2009 -0500
+++ b/src/data.cc	Fri Nov 20 14:43:38 2009 +0100
@@ -6491,7 +6491,7 @@
   int nargin = args.length ();
   octave_value retval;
 
-  if (nargin == 3 && args(0).is_numeric_type ())
+  if (nargin == 3 && args(0).is_bool_type () || args(0).is_numeric_type ())
     {
       octave_value mask_val = args(0);