[Cl-darcs-cvs] r110 - cl-darcs/trunk

[mhenoch at common-lisp.net]

Author: mhenoch
Date: Thu Mar 15 16:41:55 2007
New Revision: 110

Modified:
   cl-darcs/trunk/repo.lisp
Log:
Fix thinko in get-common-and-uncommon


Modified: cl-darcs/trunk/repo.lisp
==============================================================================
--- cl-darcs/trunk/repo.lisp	(original)
+++ cl-darcs/trunk/repo.lisp	Thu Mar 15 16:41:55 2007
@@ -159,6 +159,6 @@
   ;; regarding tags, but this will do for now.
   (let ((ours-list (apply #'append (reverse ours)))
 	(theirs-list (apply #'append (reverse theirs))))
-    (values (union ours-list theirs-list :test #'equalp)
+    (values (intersection ours-list theirs-list :test #'equalp)
 	    (set-difference ours-list theirs-list :test #'equalp)
 	    (set-difference theirs-list ours-list :test #'equalp))))