Tweaked test/mergedevbranch in a number of places in order to simplify handling (merging and testing) of multiple merges.

 - Legacy-Id: 4963

Author: levkowetz

test/mergedevbranch

@@ -124,7 +124,7 @@ else
     die "Could not find a branch matching '$branch'"
 fi
 
-if grep "@$rev $branch" mergelog; then die "Changeset $branch@$rev is already in the merge log"; fi
+if grep "@$rev $branch" mergelog; then note "Changeset $branch@$rev is already in the merge log.  Skipping it."; exit 0; fi
 
 note "Will attempt merge from $branch@$rev"
 
@@ -182,5 +182,6 @@ else
     echo "To commit it, run this commit command: ../cicmd/commit-$rev-merge.sh"
 fi
 
+echo -e "\n------------------------------------------------------------------------\n\n"