Lines Matching refs:conflictor

1279 				writecontent conflictor "conflictor1"
1280 add_annex conflictor "add conflicter"
1284 writecontent conflictor "conflictor2"
1285 add_annex conflictor "add conflicter"
1293 conflictor = "conflictor" function
1294 variantprefix = conflictor ++ ".variant"
1300 conflictor `notElem` l @? ("conflictor still present after conflict resolution")
1312 writecontent conflictor "conflictor1"
1313 add_annex conflictor "add conflicter"
1317 writecontent conflictor "conflictor2"
1318 add_annex conflictor "add conflicter"
1330 conflictor = "conflictor" function
1331 variantprefix = conflictor ++ ".variant"
1337 conflictor `notElem` l @? ("conflictor still present after conflict resolution")
1353 writecontent conflictor "conflictor"
1354 add_annex conflictor "add conflicter"
1358 createDirectory conflictor
1360 add_annex conflictor "add conflicter"
1368 conflictor = "conflictor" function
1369 subfile = conflictor </> "subfile"
1370 variantprefix = conflictor ++ ".variant"
1372 doesDirectoryExist (d </> conflictor)
1381 git_annex "get" (conflictor:v) ("get in " ++ what)
1382 …git_annex_expectoutput "find" [conflictor] [fromRawFilePath (Git.FilePath.toInternalGitPath (toRaw…
1396 writecontent conflictor "conflictor"
1397 add_annex conflictor "add conflicter"
1404 git_annex "get" [conflictor] "get conflictor"
1405 git_annex "unlock" [conflictor] "unlock conflictor"
1406 writecontent conflictor "newconflictor"
1408 removeWhenExistsWith R.removeLink (toRawFilePath conflictor)
1414 conflictor = "conflictor" function
1415 variantprefix = conflictor ++ ".variant"
1436 writecontent conflictor "conflictor"
1437 add_annex conflictor "add conflicter"
1441 writecontent conflictor nonannexed_content
1444 , "exclude=" ++ ingitfile ++ " and exclude=" ++ conflictor
1446 git "add" [conflictor] "git add conflictor"
1454 conflictor = "conflictor" function
1456 variantprefix = conflictor ++ ".variant"
1464 conflictor `elem` l @? (what ++ " conflictor file missing in: " ++ show l)
1465 s <- catchMaybeIO (readFile (d </> conflictor))
1486 writecontent conflictor "conflictor"
1487 add_annex conflictor "add conflicter"
1492 git "add" [conflictor] "git add conflictor"
1500 conflictor = "conflictor" function
1502 variantprefix = conflictor ++ ".variant"
1510 conflictor `elem` l @? (what ++ " conflictor file missing in: " ++ show l)
1511 s <- catchMaybeIO (readSymbolicLink (d </> conflictor))
1526 check conflictor
1527 check (conflictor </> "file")
1535 add_annex conflictor "add remoteconflicter"
1539 writecontent conflictor localcontent
1544 conflictor = "conflictor" function
1557 writecontent conflictor "conflictor"
1558 git_annex "add" [conflictor] "add conflicter"
1560 check_is_link conflictor "r1"
1562 createDirectory conflictor
1563 writecontent (conflictor </> "subfile") "subfile"
1564 git_annex "add" [conflictor] "add conflicter"
1566 check_is_link (conflictor </> "subfile") "r2"
1568 writecontent conflictor "conflictor"
1569 git_annex "add" [conflictor] "add conflicter"
1571 check_is_link (conflictor </> "subfile") "r3"
1573 conflictor = "conflictor" function
1589 writecontent conflictor "conflictor"
1590 git_annex "add" [conflictor] "add conflicter"
1594 writecontent conflictor "conflictor"
1595 git_annex "add" [conflictor] "add conflicter"
1596 git_annex "unlock" [conflictor] "unlock conflicter"
1604 conflictor = "conflictor" function
1605 variantprefix = conflictor ++ ".variant"
1611 conflictor `elem` l @? ("conflictor not present after conflict resolution")
1612 git_annex "get" [conflictor] "get"
1613 git_annex_expectoutput "find" [conflictor] [conflictor]
1615 checkregularfile conflictor
1630 conflictor = "conflictor" function
1635 writecontent conflictor "conflictor"
1636 git_annex "add" [conflictor] "add conflicter"
1641 conflictor `elem` l