Lines Matching refs:Modified
100 # /first/difflinks/second: Modified link removed. Should
105 # /first/difffiles/second: Modified file removed. Should
401 Modified regular file remains: /dirchange/fromdir/conflict/somefile
402 Modified regular file remains: /first/difffiles/second/file
403 Modified symbolic link remains: /first/difflinks/second/link
404 Modified directory remains: /first/difftype/second/fifo
405 Modified directory remains: /rmdir/conflict/difftype
408 Modified mismatch: /difffiles/difftype/difftype/file (regular file vs fifo file)
410 Modified link changed: /difflinks/difflinks/difflinks/link ("old" became "new")
411 Modified mismatch: /difflinks/difftype/difftype/link (symbolic link vs regular file)
414 Modified regular file changed: /difftype/difftype/difftype/one (fifo file became directory)
415 Modified symbolic link changed: /difftype/difftype/difftype/two (directory became regular file)
417 Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
418 Modified directory changed: /dirchange/fromdir/extradir (directory became symbolic link)
419 Modified regular file changed: /dirchange/todir/difffile (regular file became directory)
420 Modified fifo file changed: /dirchange/todir/difftype (regular file became directory)
539 Modified regular file remains: /dirchange/fromdir/conflict/somefile
540 Modified regular file remains: /first/difffiles/second/file
541 Modified symbolic link remains: /first/difflinks/second/link
542 Modified directory remains: /first/difftype/second/fifo
543 Modified directory remains: /rmdir/conflict/difftype
546 Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
547 Modified directory changed: /dirchange/fromdir/extradir (directory became symbolic link)