summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-03 16:33:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-03 16:33:21 -0400
commita2b4e229a4a33ecfbf1714aa1c1602bcb118d91e (patch)
tree72df5a3aca5c0700301fc42a27bf1dc998d4a4f2 /Command
parent1c37aaad3b248bddf67ad62c0d5514ac89f959b2 (diff)
rename for clarity
Diffstat (limited to 'Command')
-rw-r--r--Command/Sync.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index eea501420..2c3e235cc 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -373,7 +373,7 @@ resolveMerge = do
resolveMerge' :: LsFiles.Unmerged -> Annex (Maybe FilePath)
resolveMerge' u
- | issymlink LsFiles.valUs && issymlink LsFiles.valThem = do
+ | mergeable LsFiles.valUs && mergeable LsFiles.valThem = do
kus <- getKey LsFiles.valUs
kthem <- getKey LsFiles.valThem
case (kus, kthem) of
@@ -408,7 +408,8 @@ resolveMerge' u
| otherwise = return Nothing
where
file = LsFiles.unmergedFile u
- issymlink select = select (LsFiles.unmergedBlobType u) `elem` [Just SymlinkBlob, Nothing]
+ mergeable select = select (LsFiles.unmergedBlobType u)
+ `elem` [Just SymlinkBlob, Nothing]
makelink key = do
let dest = variantFile file key
l <- inRepo $ gitAnnexLink dest key