diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 15:39:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 15:39:19 -0400 |
| commit | 766336fcfef7150d3e4ec053b611343f1f080af0 (patch) | |
| tree | 3d9d403d840c3513f40f54cd0720aa678f6b608f | |
| parent | 6684d8e2417a645e2e6c6af442efe13539276acc (diff) | |
fix build warning5.20140709
| -rw-r--r-- | Annex/AutoMerge.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 1c463003e..d587e03d1 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -134,11 +134,11 @@ resolveMerge' (Just us) them u = do replacewithlink dest l stageSymlink dest =<< hashSymlink l - replacewithlink file link = ifM isDirect + replacewithlink dest link = ifM isDirect ( do d <- fromRepo gitAnnexMergeDir - replaceFile (d </> file) $ makeGitLink link - , replaceFile file $ makeGitLink link + replaceFile (d </> dest) $ makeGitLink link + , replaceFile dest $ makeGitLink link ) {- Stage a graft of a directory or file from a branch. |