Merge branch 'master' into relativepaths
Conflicts: Locations.hs debian/changelog
This commit is contained in:
commit
858d776352
61 changed files with 238 additions and 122 deletions
2
Test.hs
2
Test.hs
|
@ -1071,7 +1071,7 @@ test_uncommitted_conflict_resolution = do
|
|||
withtmpclonerepo False $ \r2 -> do
|
||||
indir r1 $ do
|
||||
disconnectOrigin
|
||||
createDirectoryIfMissing True (parentDir remoteconflictor)
|
||||
createDirectoryIfMissing True (takeDirectory remoteconflictor)
|
||||
writeFile remoteconflictor annexedcontent
|
||||
git_annex "add" [conflictor] @? "add remoteconflicter failed"
|
||||
git_annex "sync" [] @? "sync failed in r1"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue