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

Commit

Permalink
make 2 git merge log messages consistent with the git commands issued
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Stuart committed Sep 13, 2016
1 parent 905219a commit d454bc7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down

0 comments on commit d454bc7

Please sign in to comment.