cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix ref name

This commit is contained in:
Joey Hess 2014-08-19 16:47:00 -04:00
parent 4ae9578e36
commit 1ada0f1014
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wrapper.hs
View File

@ -140,7 +140,7 @@ setupupstreammaster newref propellordir = do
n (" A newer upstream version is available in " ++ distrepo) n (" A newer upstream version is available in " ++ distrepo)
if havebranch if havebranch
then n (" To merge it, run: git merge " ++ upstreambranch) 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 "" n ""
fetchUpstreamBranch :: FilePath -> FilePath -> IO () fetchUpstreamBranch :: FilePath -> FilePath -> IO ()