From 886c5ada5322e52f7889af9045967b74d4f9df51 Mon Sep 17 00:00:00 2001
From: Tim Byrne <sultan@locehilios.com>
Date: Tue, 14 Jul 2015 08:16:45 -0500
Subject: [PATCH] Fix merge notice

---
 yadm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/yadm b/yadm
index 3b8e310..ee87d22 100755
--- a/yadm
+++ b/yadm
@@ -148,9 +148,11 @@ function clone() {
   #; fetch / merge (and possibly fallback to reset)
   debug "Doing an initial fetch of the origin"
   git fetch origin
+  debug "Doing an initial merge of origin/master"
   git merge origin/master || {
+    debug "Merge failed, doing a reset."
     git reset origin/master
-    echo <<EOF
+    cat <<EOF
 **NOTE**
   Merging origin/master failed.
   YADM did 'reset origin/master' instead.