summaryrefslogtreecommitdiff
path: root/Git/UnionMerge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-11 01:52:58 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-11 01:52:58 -0400
commit637b5feb45013f69f3aacbafeb796de666d3faa3 (patch)
tree17e5506c3715be46318d15dd76ec474641faffe2 /Git/UnionMerge.hs
parentb327227ba596d4fc5012138d03390c3eb861b808 (diff)
lint
Diffstat (limited to 'Git/UnionMerge.hs')
-rw-r--r--Git/UnionMerge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs
index 32966c846..30778d034 100644
--- a/Git/UnionMerge.hs
+++ b/Git/UnionMerge.hs
@@ -37,7 +37,7 @@ merge x y repo = do
- the index are preserved (and participate in the merge). -}
merge_index :: Repo -> [String] -> IO ()
merge_index repo bs =
- update_index repo =<< concat <$> mapM (\b -> merge_tree_index b repo) bs
+ update_index repo =<< concat <$> mapM (`merge_tree_index` repo) bs
{- Feeds a list into update-index. Later items in the list can override
- earlier ones, so the list can be generated from any combination of