summaryrefslogtreecommitdiff
path: root/src/wrapper.hs
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 17:17:36 -0400
committerJoey Hess2014-08-19 17:17:36 -0400
commit1bf736293dbbbc8dd4f302e00587a7b4eb4b8ab9 (patch)
tree203369f6ed98b06403f4b2947dd8e6def5361b8b /src/wrapper.hs
parent7743da0c3d0a155fb35dbc5d124dba966675da97 (diff)
syntax
Diffstat (limited to 'src/wrapper.hs')
-rw-r--r--src/wrapper.hs2
1 files changed, 1 insertions, 1 deletions
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