diff options
author | Joey Hess <joey@kitenet.net> | 2012-02-09 17:35:36 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-02-09 17:35:36 -0400 |
commit | e4d09235446e13134e28aa4519c54ec14061d126 (patch) | |
tree | 816bf0f7899b05c04d65c808ccdf85a014c876af | |
parent | 1c0bd81ba6aa6bd081042c81fcb6dca21ece0eec (diff) |
wording
-rw-r--r-- | Git/UnionMerge.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index be8eb10d9..90bbf5c4c 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -85,13 +85,14 @@ merge_trees (Ref x) (Ref y) h = calc_merge h $ "diff-tree":diff_opts ++ [x, y] {- For merging a single tree into the index. -} merge_tree_index :: Ref -> CatFileHandle -> Repo -> Streamer -merge_tree_index (Ref x) h = calc_merge h $ "diff-index":diff_opts ++ ["--cached", x] +merge_tree_index (Ref x) h = calc_merge h $ + "diff-index" : diff_opts ++ ["--cached", x] diff_opts :: [String] diff_opts = ["--raw", "-z", "-r", "--no-renames", "-l0"] {- Calculates how to perform a merge, using git to get a raw diff, - - and returning a list suitable for update_index. -} + - and generating update-index input. -} calc_merge :: CatFileHandle -> [String] -> Repo -> Streamer calc_merge ch differ repo streamer = gendiff >>= go where @@ -102,7 +103,7 @@ calc_merge ch differ repo streamer = gendiff >>= go go (_:[]) = error "calc_merge parse error" {- Given an info line from a git raw diff, and the filename, generates - - a line suitable for update_index that union merges the two sides of the + - a line suitable for update-index that union merges the two sides of the - diff. -} mergeFile :: String -> FilePath -> CatFileHandle -> Repo -> IO (Maybe String) mergeFile info file h repo = case filter (/= nullSha) [Ref asha, Ref bsha] of |