From 03ead14749f5db167e5e41af3ca441ae25a2142e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Apr 2014 13:14:05 -0400 Subject: comment typo --- propellor.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'propellor.hs') diff --git a/propellor.hs b/propellor.hs index e4653f30..c7727751 100644 --- a/propellor.hs +++ b/propellor.hs @@ -74,7 +74,7 @@ wrapper args propellordir propellorbin = do void $ boolSystem "git" [Param "remote", Param "add", Param "upstream", Param srcrepo] -- Connect synthetic git repo with upstream history so -- merging with upstream will work going forward. - -- Note -s outs is used to avoid getting any divergent + -- Note -s ours is used to avoid getting any divergent -- changes from upstream. when fromsrcdir $ do void $ boolSystem "git" [Param "fetch", Param "upstream"] -- cgit v1.2.3