[Lunar-commits] <moonbase> mutt-cvs, mutt-devel: Updated CONFLICTS for mutt-hg

[Terry Chan]

commit d5721ace13d2b79ead4fceb70cff8c22a33ab48a
Author: Terry Chan <tchan at lunar-linux.org>
Date:   Mon Oct 27 11:05:48 2008 -0500

    mutt-cvs, mutt-devel: Updated CONFLICTS for mutt-hg
---
 zbeta/mutt-cvs/CONFLICTS   |    3 ++-
 zbeta/mutt-devel/CONFLICTS |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zbeta/mutt-cvs/CONFLICTS b/zbeta/mutt-cvs/CONFLICTS
index a080c7b..dc4cdcc 100644
--- a/zbeta/mutt-cvs/CONFLICTS
+++ b/zbeta/mutt-cvs/CONFLICTS
@@ -1,2 +1,3 @@
 conflicts mutt &&
-conflicts mutt-devel
+conflicts mutt-devel &&
+conflicts mutt-hg
diff --git a/zbeta/mutt-devel/CONFLICTS b/zbeta/mutt-devel/CONFLICTS
index 1c24551..d93f490 100644
--- a/zbeta/mutt-devel/CONFLICTS
+++ b/zbeta/mutt-devel/CONFLICTS
@@ -1,2 +1,3 @@
 conflicts mutt &&
-conflicts mutt-cvs
+conflicts mutt-cvs &&
+conflicts mutt-hg