From 28c189e4e26fadf541251bd48654f072e917012d Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 23 Oct 2013 09:46:43 -0400
Subject: [PATCH] Better representation of no cross-version suffix in suffix
 conflict error message.

---
 ivy/src/main/scala/sbt/ConflictWarning.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ivy/src/main/scala/sbt/ConflictWarning.scala b/ivy/src/main/scala/sbt/ConflictWarning.scala
index b5ccd1967..51c69e988 100644
--- a/ivy/src/main/scala/sbt/ConflictWarning.scala
+++ b/ivy/src/main/scala/sbt/ConflictWarning.scala
@@ -38,7 +38,7 @@ object ConflictWarning
 			val conflictMsgs =
 				for( ((org,rawName), fullNames) <- crossMismatches ) yield
 				{
-					val suffixes = fullNames.map(n => "_" + getCrossSuffix(n)).mkString(", ")
+					val suffixes = fullNames.map(getCrossSuffix).mkString(", ")
 					s"${idString(org,rawName)} $suffixes"
 				}
 			log.log(config.level, conflictMsgs.mkString(pre, "\n   ", ""))
@@ -73,8 +73,8 @@ object ConflictWarning
 		case _ => s
 	}
 	private[this] def getCrossSuffix(s: String): String = s match {
-		case CrossSuffixPattern(_, v) => v
-		case _ => ""
+		case CrossSuffixPattern(_, v) => "_" + v
+		case _ => "<none>"
 	}
 
 }