diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 16:47:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 16:47:06 -0400 |
| commit | 922f916baf4da6435a390896e949d870e9a3dfab (patch) | |
| tree | 05694a795c153df3fd45359d658fd9e6137ee8aa /src | |
| parent | 2ed83d6fccf5727ef1bb7116d0e7952f20fb396d (diff) | |
| parent | 1ada0f10141405c8c20decddf893eb5186be8581 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapper.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs index 6912e204..c7241991 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -140,7 +140,7 @@ setupupstreammaster newref propellordir = do n (" A newer upstream version is available in " ++ distrepo) if havebranch then n (" To merge it, run: git merge " ++ upstreambranch) - else n (" To merge it, find the most recent commit in your repository's history that corresponds to an upstream release of propellor, and set refs/heads/" ++ upstreambranch ++ " to it. Then run propellor again." ) + else n (" 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 "" fetchUpstreamBranch :: FilePath -> FilePath -> IO () |