diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-04-21 23:32:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-04-21 23:32:33 -0400 |
| commit | ed79596b758935a3f22bf6803bc082a6bbe10f58 (patch) | |
| tree | 885a8a50e68dafb39ec886cb31aa4c549fbeb35e /Git/UnionMerge.hs | |
| parent | bee420bd2d0cbe16489b061b208083e2b8ba9d0e (diff) | |
noop
Diffstat (limited to 'Git/UnionMerge.hs')
| -rw-r--r-- | Git/UnionMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index 90bbf5c4c..d68bb61ab 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -97,7 +97,7 @@ calc_merge :: CatFileHandle -> [String] -> Repo -> Streamer calc_merge ch differ repo streamer = gendiff >>= go where gendiff = pipeNullSplit (map Param differ) repo - go [] = return () + go [] = noop go (info:file:rest) = mergeFile info file ch repo >>= maybe (go rest) (\l -> streamer l >> go rest) go (_:[]) = error "calc_merge parse error" |