From 08df492348e507bd63c5589813f5dbd4f85875de Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Mon, 24 Oct 2011 16:09:25 +0000
Subject: [PATCH] CONFLICTs need to stay on one line for
 Cfg::Utils::preempt_conflict()

---
 Stow.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Stow.pm b/Stow.pm
index 08589da..9e14451 100755
--- a/Stow.pm
+++ b/Stow.pm
@@ -525,7 +525,7 @@ sub Conflict {
   my $src = &AbbrevHome(&JoinPaths($opts{stow},   $a));
   my $dst = &AbbrevHome(&JoinPaths($opts{target}, $b));
 
-  my $msg = "CONFLICT:\n  $src\nvs.\n  $dst" . ($type ? "\n  ($type)" : '') . "\n\n";
+  my $msg = "CONFLICT: $src vs. $dst" . ($type ? " ($type)" : '') . "\n";
   if ($opts{conflicts}) {
     warn $msg;
     #system "ls -l $src $dst";