summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 17:17:42 -0400
committerJoey Hess2014-08-19 17:17:42 -0400
commitbddd8c7b91e5f246d6cea8ac76d42b8028e4c318 (patch)
tree85bc7223da665a3ed261e604d35df614024d21ad
parentbd1af7f39fb8e4b19a5fd2677b221f0e482d5351 (diff)
parent1bf736293dbbbc8dd4f302e00587a7b4eb4b8ab9 (diff)
Merge branch 'joeyconfig'
-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