Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Tidy up git merge messages
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Stuart committed Sep 13, 2016
1 parent 02e85c9 commit 905219a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@
<arg value="deferred"/>
<arg value="--ff-only"/>
<arg value="-m"/>
<arg value="'Merging deferred branch into immediate branch.'"/>
<arg value="Merge deferred branch into immediate branch"/>
</exec>
</target>

Expand All @@ -773,7 +773,7 @@
<arg value="immediate"/>
<arg value="--ff-only"/>
<arg value="-m"/>
<arg value="'Merging immediate branch into master branch.'"/>
<arg value="Merge immediate branch into master branch"/>
</exec>
</target>

Expand All @@ -791,7 +791,7 @@
<arg value="master"/>
<arg value="--ff-only"/>
<arg value="-m"/>
<arg value="'Merging master branch into immediate branch.'"/>
<arg value="Merge master branch into immediate branch"/>
</exec>
</target>

Expand All @@ -808,7 +808,7 @@
<arg value="merge"/>
<arg value="immediate"/>
<arg value="-m"/>
<arg value="'Merging immedate branch into deferred branch.'"/>
<arg value="Merge immedate branch into deferred branch"/>
</exec>
</target>

Expand All @@ -826,7 +826,7 @@
<arg value="master"/>
<arg value="--ff-only"/>
<arg value="-m"/>
<arg value="'Merging immedate branch into deferred branch.'"/>
<arg value="Merge immedate branch into deferred branch"/>
</exec>
</target>

Expand All @@ -844,7 +844,7 @@
<arg value="deferred"/>
<arg value="--ff-only"/>
<arg value="-m"/>
<arg value="'Merging immedate branch into deferred branch.'"/>
<arg value="Merge immedate branch into deferred branch"/>
</exec>
</target>

Expand Down

0 comments on commit 905219a

Please sign in to comment.