diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-11 16:55:36 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-11 16:55:36 -0400 |
| commit | e04852c8af22f784d184a001b9fee04adb1828c1 (patch) | |
| tree | 025caa9f08d1c3ad0479bd14370851b0bef4afd3 /Git | |
| parent | 730041688d616bff4df745c6605bbaff52733513 (diff) | |
| parent | 81f311103d99ec5bfd31ae5a76d6add05ff40121 (diff) | |
Merge branch 'master' into new-monad-control
Conflicts:
git-annex.cabal
Diffstat (limited to 'Git')
| -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 edc8cb20b..ddbff6a82 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -48,7 +48,7 @@ merge_index h repo bs = - earlier ones, so the list can be generated from any combination of - ls_tree, merge_trees, and merge_tree_index. -} update_index :: Repo -> [String] -> IO () -update_index repo ls = stream_update_index repo [\s -> mapM_ s ls] +update_index repo ls = stream_update_index repo [(`mapM_` ls)] {- Streams content into update-index. -} stream_update_index :: Repo -> [Streamer] -> IO () |