Mercurial > forge

changeset 1241:a54d2a8ea2e9 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reverse nargin conflict changes
author pkienzle
date Wed, 28 Jan 2004 22:40:04 +0000
parents a4fd2e3c9e96
children 00c9d2c0a105
files main/miscellaneous/read_options.m
diffstat 1 files changed, 0 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/main/miscellaneous/read_options.m	Wed Jan 28 22:38:27 2004 +0000
+++ b/main/miscellaneous/read_options.m	Wed Jan 28 22:40:04 2004 +0000
@@ -56,14 +56,8 @@
 op0 = op1 = " ";
 skipnan = prefix = quiet = nocase = quiet = 0;
 
-<<<<<<< read_options.m
-nargin = nargin();
-nargin--;
-if rem (nargin, 2), error ("odd number of optional args"); end
-=======
 args = nargin-1;  # nargin is now a function
 if rem (args, 2), error ("odd number of optional args"); end
->>>>>>> 1.9
 
 
 ## beginpos 2.1.39