Merge pull request #533 from ASCWebServices/lee5151

update tmux-parallel-push merge-conflict code

scripts/tmux-parallel-push.sh

@@ -55,8 +55,8 @@
 MERGE_ERR=$(grep -rnw './' -e "Merge conflict");
 if [[ -n ${MERGE_ERR} ]];
 then
-    echo; echo "It looks there were some errors. Review merge-conflicts.txt for more information."; echo;
-    echo "$MERGE_ERR" > ./merge-conflicts.txt;
+    echo; echo "It looks there were some errors. Review _merge-conflicts.txt for more information."; echo;
+    echo "$MERGE_ERR" > ./_merge-conflicts.txt;
 else
     echo; echo "No automatic merge issues detected. Success?"; echo;
 fi