diff --git a/src/wrapper.hs b/src/wrapper.hs index 5807cb4..7b74865 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -146,7 +146,7 @@ setupupstreammaster newref propellordir = do if havebranch then also ("To merge it, run: git merge " ++ upstreambranch) else also ("To merge it, find the most recent commit in your repository's history that corresponds to an upstream release of propellor, and set refs/remotes/" ++ upstreambranch ++ " to it. Then run propellor again.") - n "" + also "" fetchUpstreamBranch :: FilePath -> FilePath -> IO () fetchUpstreamBranch propellordir repo = do