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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-08-19 17:17:42 -04:00
parent bd1af7f39f 1bf736293d
commit bddd8c7b91
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

@ -146,7 +146,7 @@ setupupstreammaster newref propellordir = do
if havebranch if havebranch
then also ("To merge it, run: git merge " ++ upstreambranch) 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.") 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 :: FilePath -> FilePath -> IO ()
fetchUpstreamBranch propellordir repo = do fetchUpstreamBranch propellordir repo = do