From d454bc776810caf39208fffce9a87c7b5adf68fe Mon Sep 17 00:00:00 2001
From: Alex Stuart <alex.stuart@jisc.ac.uk>
Date: Tue, 13 Sep 2016 14:01:14 +0100
Subject: [PATCH] make 2 git merge log messages consistent with the git
 commands issued

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index c6b82e79..f55a207f 100644
--- a/build.xml
+++ b/build.xml
@@ -826,7 +826,7 @@
             <arg value="master"/>
             <arg value="--ff-only"/>
             <arg value="-m"/>
-            <arg value="Merge immedate branch into deferred branch"/>
+            <arg value="Merge master branch into deferred branch"/>
         </exec>
     </target>
 
@@ -844,7 +844,7 @@
             <arg value="deferred"/>
             <arg value="--ff-only"/>
             <arg value="-m"/>
-            <arg value="Merge immedate branch into deferred branch"/>
+            <arg value="Merge deferred branch into master branch"/>
         </exec>
     </target>