cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 22:17:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Cyberboss-patch-1

Browse Source
This commit is contained in:
Jordan Brown
2017-11-12 13:16:24 -05:00
committed by GitHub
parent d244248618 b5378a7044
commit b2e85ed9ac
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServerService/ServerInstance/Repository.cs
+1 -1
View File
@@ -660,7 +660,7 @@ namespace TGServerService
if (!successOnUpToDate && Repo.Head.Tip.Sha == originBranch.Tip.Sha)
return RepoErrorUpToDate;
SendMessage(String.Format("REPO: Updating origin branch...({0})", reset ? "Hard Reset" : "Merge"), MessageType.DeveloperInfo);
SendMessage(String.Format("REPO: Updating origin branch...{0}", reset ? "" : "(Merge)"), MessageType.DeveloperInfo);
if (reset)
{