mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12632] Revert previous commit (see Notes)

Browse source
This commit is contained in:
billy1arm 2013-05-31 13:50:57 +01:00 • committed by Antz
parent 1cd806c02e
commit ef445ea523
1462 changed files with 9689 additions and 7080 deletions
Download patch file Download diff file Expand all files Collapse all files

6
contrib/MergeHelper.sh
View file

@ -1,5 +1,5 @@
#!/bin/sh
# This file is part of the CMaNGOS Project. See AUTHORS file for Copyright information
# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
# This program is free software licensed under GPL version 2
# Please see the included COPYING for full text */
@ -68,7 +68,7 @@ EOF
# Display help
function display_help {
echo
echo "Welcome to the CMaNGOS merge helper $script_file_name"
echo "Welcome to the MaNGOS merge helper $script_file_name"
echo
echo "Run this tool from a bash compatible terminal (on windows like Git Bash)"
echo
@ -106,7 +106,7 @@ function merge_pull_request {
git rev-parse --git-dir 1>/dev/null 2>&1
if [[ $? -ne 0 ]]; then
echo "ERROR: This script must be used within a Git working tree"
echo "Try to start from your main cmangos directory by using"
echo "Try to start from your main mangos directory by using"
echo " \"contrib/$script_file_name\""
read -p"Press [RETURN] to exit"
exit 1