# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1248981244 -7200
# Node ID 983de84e4bf32b4bcd8bd70417e9d6403db28396
# Parent  25ed2d6aacf68214d44904edc2c6592c81c4867e
rename merge -> ifelse

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-30  Jaroslav Hajek  <highegg@gmail.com>
+
+	* data.cc (Fmerge): Rename to Fifelse.
+
 2009-07-30  David Grundberg  <individ@acc.umu.se>
 
 	* symtab.h (symbol_table::parent_scope): Remove.
diff --git a/src/data.cc b/src/data.cc
--- a/src/data.cc
+++ b/src/data.cc
@@ -6060,9 +6060,9 @@
                          fval.INTX ## _array_value ()); \
     }
 
-DEFUN (merge, args, ,
+DEFUN (ifelse, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} merge (@var{mask}, @var{tval}, @var{fval})\n\
+@deftypefn {Built-in Function} {} ifelse (@var{mask}, @var{tval}, @var{fval})\n\
 Merges elements of @var{true_val} and @var{false_val}, depending on the value of\n\
 @var{mask}. If @var{mask} is a logical scalar, the other two arguments can be\n\
 arbitrary values. Otherwise, @var{mask} must be a logical array, and @var{tval},\n\