From 1bf736293dbbbc8dd4f302e00587a7b4eb4b8ab9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Aug 2014 17:17:36 -0400 Subject: syntax --- src/wrapper.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wrapper.hs b/src/wrapper.hs index 5807cb41..7b748659 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 -- cgit v1.2.3