Author: mhenoch Date: Sun Jul 9 12:52:18 2006 New Revision: 20 Modified: cl-darcs/trunk/read-patch.lisp Log: Fix inverted confusion for read-merger Modified: cl-darcs/trunk/read-patch.lisp ============================================================================== --- cl-darcs/trunk/read-patch.lisp (original) +++ cl-darcs/trunk/read-patch.lisp Sun Jul 9 12:52:18 2006 @@ -97,10 +97,10 @@ (read-change-pref stream)) ((string= token "merger") - (read-merger stream t)) + (read-merger stream nil)) ((string= token "regrem") - (read-merger stream nil)) + (read-merger stream t)) ((string= token "conflict") (read-conflict stream))