diff options
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Sync.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index d6f1022cc..9923d6dfd 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -302,7 +302,7 @@ mergeFile file key | otherwise = go $ shortHash $ key2file key where varmarker = ".variant-" - doubleconflict = varmarker `isSuffixOf` (dropExtension file) + doubleconflict = varmarker `isInfixOf` file go v = takeDirectory file </> dropExtension (takeFileName file) ++ varmarker ++ v |