Merge branch 'master' into assistant
This commit is contained in:
commit
2e501364d4
3 changed files with 126 additions and 1 deletions
|
@ -265,7 +265,7 @@ mergeFile file key
|
|||
| otherwise = go $ shortHash $ show key
|
||||
where
|
||||
varmarker = ".variant-"
|
||||
doubleconflict = vermarker `isSuffixOf` (dropExtension file)
|
||||
doubleconflict = varmarker `isSuffixOf` (dropExtension file)
|
||||
go v = takeDirectory file
|
||||
</> dropExtension (takeFileName file)
|
||||
++ varmarker ++ v
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue