25. - SubForWork\DeleteWorkFromOnly.txt\r
26. !* SubForWork\UpdateBothSame_ForWork.txt\r
27. *!. UpdateBase.txt\r
-28. *!* UpdateBoth.txt\r
-29. *=* UpdateSame.txt\r
-30. .!* UpdateWork.txt\r
+28. *!. UpdateBaseAlmostSame.txt\r
+29. *=. UpdateBaseAlmostSameToSame.txt\r
+30. *!* UpdateBoth.txt\r
+31. *!* UpdateBothAlmostSame.txt\r
+32. *=* UpdateSame.txt\r
+33. .!* UpdateWork.txt\r
+34. .!* UpdateWorkAlmostSame.txt\r
+35. .=* UpdateWorkAlmostSameToSame.txt\r
\r
-------------------------------------------------------------------------------\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. +!. CopyAndModifyToBase.txt\r
-2. .!+ CopyAndModifyToWork.txt\r
-3. +=. CopyToBase.txt\r
-4. .=+ CopyToWork.txt\r
-5. -!. DeleteBaseFromBoth.txt\r
-6. - DeleteBaseFromOnly.txt\r
-7. - - DeleteBoth.txt\r
-8. .!- DeleteWorkFromBoth.txt\r
-9. - DeleteWorkFromOnly.txt\r
-10. +! NewBase.txt\r
-11. +!+ NewNotSame.txt\r
-12. +=+ NewSame.txt\r
-13. !+ NewWork.txt\r
-14. - SubForWork\DeleteBaseFromOnly.txt\r
-15. - - SubForWork\DeleteBoth.txt\r
-16. - SubForWork\DeleteWorkFromOnly.txt\r
-17. *!. SubForWork\UpdateBase.txt\r
-18. *! SubForWork\UpdateBothSame_ForBase.txt\r
-19. !* SubForWork\UpdateBothSame_ForWork.txt\r
-20. .!* SubForWork\UpdateWork.txt\r
-21. *!. UpdateBase.txt\r
-22. *!* UpdateBoth.txt\r
-23. *=* UpdateSame.txt\r
-24. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. +!. CopyAndModifyToBase.txt\r
+2. .!+ CopyAndModifyToWork.txt\r
+3. +=. CopyToBase.txt\r
+4. .=+ CopyToWork.txt\r
+5. -!. DeleteBaseFromBoth.txt\r
+6. - DeleteBaseFromOnly.txt\r
+7. - - DeleteBoth.txt\r
+8. .!- DeleteWorkFromBoth.txt\r
+9. - DeleteWorkFromOnly.txt\r
+10. +! NewBase.txt\r
+11. +!+ NewNotSame.txt\r
+12. +=+ NewSame.txt\r
+13. !+ NewWork.txt\r
+14. - SubForWork\DeleteBaseFromOnly.txt\r
+15. - - SubForWork\DeleteBoth.txt\r
+16. - SubForWork\DeleteWorkFromOnly.txt\r
+17. *!. SubForWork\UpdateBase.txt\r
+18. *! SubForWork\UpdateBothSame_ForBase.txt\r
+19. !* SubForWork\UpdateBothSame_ForWork.txt\r
+20. .!* SubForWork\UpdateWork.txt\r
+21. *!. UpdateBase.txt\r
+22. *!. UpdateBaseAlmostSame.txt\r
+23. *=. UpdateBaseAlmostSameToSame.txt\r
+24. *!* UpdateBoth.txt\r
+25. *!* UpdateBothAlmostSame.txt\r
+26. *=* UpdateSame.txt\r
+27. .!* UpdateWork.txt\r
+28. .!* UpdateWorkAlmostSame.txt\r
+29. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\CopyAndModifyToBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: CopyAndModifyToBase.txt (+\90V\8bK)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: CopyAndModifyToBase.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (+\90V\8bK) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>copy_ren "%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\CopyAndModifyToBase.txt"\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\CopyAndModifyToBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: CopyAndModifyToBase.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: CopyAndModifyToBase.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. .!+ CopyAndModifyToWork.txt\r
-2. +=. CopyToBase.txt\r
-3. .=+ CopyToWork.txt\r
-4. -!. DeleteBaseFromBoth.txt\r
-5. - DeleteBaseFromOnly.txt\r
-6. - - DeleteBoth.txt\r
-7. .!- DeleteWorkFromBoth.txt\r
-8. - DeleteWorkFromOnly.txt\r
-9. +! NewBase.txt\r
-10. +!+ NewNotSame.txt\r
-11. +=+ NewSame.txt\r
-12. !+ NewWork.txt\r
-13. - SubForWork\DeleteBaseFromOnly.txt\r
-14. - - SubForWork\DeleteBoth.txt\r
-15. - SubForWork\DeleteWorkFromOnly.txt\r
-16. *!. SubForWork\UpdateBase.txt\r
-17. *! SubForWork\UpdateBothSame_ForBase.txt\r
-18. !* SubForWork\UpdateBothSame_ForWork.txt\r
-19. .!* SubForWork\UpdateWork.txt\r
-20. *!. UpdateBase.txt\r
-21. *!* UpdateBoth.txt\r
-22. *=* UpdateSame.txt\r
-23. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. .!+ CopyAndModifyToWork.txt\r
+2. +=. CopyToBase.txt\r
+3. .=+ CopyToWork.txt\r
+4. -!. DeleteBaseFromBoth.txt\r
+5. - DeleteBaseFromOnly.txt\r
+6. - - DeleteBoth.txt\r
+7. .!- DeleteWorkFromBoth.txt\r
+8. - DeleteWorkFromOnly.txt\r
+9. +! NewBase.txt\r
+10. +!+ NewNotSame.txt\r
+11. +=+ NewSame.txt\r
+12. !+ NewWork.txt\r
+13. - SubForWork\DeleteBaseFromOnly.txt\r
+14. - - SubForWork\DeleteBoth.txt\r
+15. - SubForWork\DeleteWorkFromOnly.txt\r
+16. *!. SubForWork\UpdateBase.txt\r
+17. *! SubForWork\UpdateBothSame_ForBase.txt\r
+18. !* SubForWork\UpdateBothSame_ForWork.txt\r
+19. .!* SubForWork\UpdateWork.txt\r
+20. *!. UpdateBase.txt\r
+21. *!. UpdateBaseAlmostSame.txt\r
+22. *=. UpdateBaseAlmostSameToSame.txt\r
+23. *!* UpdateBoth.txt\r
+24. *!* UpdateBothAlmostSame.txt\r
+25. *=* UpdateSame.txt\r
+26. .!* UpdateWork.txt\r
+27. .!* UpdateWorkAlmostSame.txt\r
+28. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\CopyAndModifyToWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: CopyAndModifyToWork.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: CopyAndModifyToWork.txt (+\90V\8bK)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (+\90V\8bK) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>copy_ren "%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\CopyAndModifyToWork.txt"\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\CopyAndModifyToWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: CopyAndModifyToWork.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: CopyAndModifyToWork.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. +=. CopyToBase.txt\r
-2. .=+ CopyToWork.txt\r
-3. -!. DeleteBaseFromBoth.txt\r
-4. - DeleteBaseFromOnly.txt\r
-5. - - DeleteBoth.txt\r
-6. .!- DeleteWorkFromBoth.txt\r
-7. - DeleteWorkFromOnly.txt\r
-8. +! NewBase.txt\r
-9. +!+ NewNotSame.txt\r
-10. +=+ NewSame.txt\r
-11. !+ NewWork.txt\r
-12. - SubForWork\DeleteBaseFromOnly.txt\r
-13. - - SubForWork\DeleteBoth.txt\r
-14. - SubForWork\DeleteWorkFromOnly.txt\r
-15. *!. SubForWork\UpdateBase.txt\r
-16. *! SubForWork\UpdateBothSame_ForBase.txt\r
-17. !* SubForWork\UpdateBothSame_ForWork.txt\r
-18. .!* SubForWork\UpdateWork.txt\r
-19. *!. UpdateBase.txt\r
-20. *!* UpdateBoth.txt\r
-21. *=* UpdateSame.txt\r
-22. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. +=. CopyToBase.txt\r
+2. .=+ CopyToWork.txt\r
+3. -!. DeleteBaseFromBoth.txt\r
+4. - DeleteBaseFromOnly.txt\r
+5. - - DeleteBoth.txt\r
+6. .!- DeleteWorkFromBoth.txt\r
+7. - DeleteWorkFromOnly.txt\r
+8. +! NewBase.txt\r
+9. +!+ NewNotSame.txt\r
+10. +=+ NewSame.txt\r
+11. !+ NewWork.txt\r
+12. - SubForWork\DeleteBaseFromOnly.txt\r
+13. - - SubForWork\DeleteBoth.txt\r
+14. - SubForWork\DeleteWorkFromOnly.txt\r
+15. *!. SubForWork\UpdateBase.txt\r
+16. *! SubForWork\UpdateBothSame_ForBase.txt\r
+17. !* SubForWork\UpdateBothSame_ForWork.txt\r
+18. .!* SubForWork\UpdateWork.txt\r
+19. *!. UpdateBase.txt\r
+20. *!. UpdateBaseAlmostSame.txt\r
+21. *=. UpdateBaseAlmostSameToSame.txt\r
+22. *!* UpdateBoth.txt\r
+23. *!* UpdateBothAlmostSame.txt\r
+24. *=* UpdateSame.txt\r
+25. .!* UpdateWork.txt\r
+26. .!* UpdateWorkAlmostSame.txt\r
+27. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\CopyToBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\CopyToBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: CopyToBase.txt (+\90V\8bK)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: CopyToBase.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (+\90V\8bK) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
\r
\81\9a[WARNING] \83x\81[\83X\82Æ\83\8f\81[\83N\82Å\93à\97e\82ª\88Ù\82È\82Á\82Ä\82¢\82½\82Ì\82ª\93¯\82¶\82É\82È\82è\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\CopyToBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\CopyToBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: CopyToBase.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: CopyToBase.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. .=+ CopyToWork.txt\r
-2. -!. DeleteBaseFromBoth.txt\r
-3. - DeleteBaseFromOnly.txt\r
-4. - - DeleteBoth.txt\r
-5. .!- DeleteWorkFromBoth.txt\r
-6. - DeleteWorkFromOnly.txt\r
-7. +! NewBase.txt\r
-8. +!+ NewNotSame.txt\r
-9. +=+ NewSame.txt\r
-10. !+ NewWork.txt\r
-11. - SubForWork\DeleteBaseFromOnly.txt\r
-12. - - SubForWork\DeleteBoth.txt\r
-13. - SubForWork\DeleteWorkFromOnly.txt\r
-14. *!. SubForWork\UpdateBase.txt\r
-15. *! SubForWork\UpdateBothSame_ForBase.txt\r
-16. !* SubForWork\UpdateBothSame_ForWork.txt\r
-17. .!* SubForWork\UpdateWork.txt\r
-18. *!. UpdateBase.txt\r
-19. *!* UpdateBoth.txt\r
-20. *=* UpdateSame.txt\r
-21. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. .=+ CopyToWork.txt\r
+2. -!. DeleteBaseFromBoth.txt\r
+3. - DeleteBaseFromOnly.txt\r
+4. - - DeleteBoth.txt\r
+5. .!- DeleteWorkFromBoth.txt\r
+6. - DeleteWorkFromOnly.txt\r
+7. +! NewBase.txt\r
+8. +!+ NewNotSame.txt\r
+9. +=+ NewSame.txt\r
+10. !+ NewWork.txt\r
+11. - SubForWork\DeleteBaseFromOnly.txt\r
+12. - - SubForWork\DeleteBoth.txt\r
+13. - SubForWork\DeleteWorkFromOnly.txt\r
+14. *!. SubForWork\UpdateBase.txt\r
+15. *! SubForWork\UpdateBothSame_ForBase.txt\r
+16. !* SubForWork\UpdateBothSame_ForWork.txt\r
+17. .!* SubForWork\UpdateWork.txt\r
+18. *!. UpdateBase.txt\r
+19. *!. UpdateBaseAlmostSame.txt\r
+20. *=. UpdateBaseAlmostSameToSame.txt\r
+21. *!* UpdateBoth.txt\r
+22. *!* UpdateBothAlmostSame.txt\r
+23. *=* UpdateSame.txt\r
+24. .!* UpdateWork.txt\r
+25. .!* UpdateWorkAlmostSame.txt\r
+26. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\CopyToWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\CopyToWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: CopyToWork.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: CopyToWork.txt (+\90V\8bK)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (+\90V\8bK) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
\r
\81\9a[WARNING] \83x\81[\83X\82Æ\83\8f\81[\83N\82Å\93à\97e\82ª\88Ù\82È\82Á\82Ä\82¢\82½\82Ì\82ª\93¯\82¶\82É\82È\82è\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\CopyToWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\CopyToWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: CopyToWork.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: CopyToWork.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. -!. DeleteBaseFromBoth.txt\r
-2. - DeleteBaseFromOnly.txt\r
-3. - - DeleteBoth.txt\r
-4. .!- DeleteWorkFromBoth.txt\r
-5. - DeleteWorkFromOnly.txt\r
-6. +! NewBase.txt\r
-7. +!+ NewNotSame.txt\r
-8. +=+ NewSame.txt\r
-9. !+ NewWork.txt\r
-10. - SubForWork\DeleteBaseFromOnly.txt\r
-11. - - SubForWork\DeleteBoth.txt\r
-12. - SubForWork\DeleteWorkFromOnly.txt\r
-13. *!. SubForWork\UpdateBase.txt\r
-14. *! SubForWork\UpdateBothSame_ForBase.txt\r
-15. !* SubForWork\UpdateBothSame_ForWork.txt\r
-16. .!* SubForWork\UpdateWork.txt\r
-17. *!. UpdateBase.txt\r
-18. *!* UpdateBoth.txt\r
-19. *=* UpdateSame.txt\r
-20. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. -!. DeleteBaseFromBoth.txt\r
+2. - DeleteBaseFromOnly.txt\r
+3. - - DeleteBoth.txt\r
+4. .!- DeleteWorkFromBoth.txt\r
+5. - DeleteWorkFromOnly.txt\r
+6. +! NewBase.txt\r
+7. +!+ NewNotSame.txt\r
+8. +=+ NewSame.txt\r
+9. !+ NewWork.txt\r
+10. - SubForWork\DeleteBaseFromOnly.txt\r
+11. - - SubForWork\DeleteBoth.txt\r
+12. - SubForWork\DeleteWorkFromOnly.txt\r
+13. *!. SubForWork\UpdateBase.txt\r
+14. *! SubForWork\UpdateBothSame_ForBase.txt\r
+15. !* SubForWork\UpdateBothSame_ForWork.txt\r
+16. .!* SubForWork\UpdateWork.txt\r
+17. *!. UpdateBase.txt\r
+18. *!. UpdateBaseAlmostSame.txt\r
+19. *=. UpdateBaseAlmostSameToSame.txt\r
+20. *!* UpdateBoth.txt\r
+21. *!* UpdateBothAlmostSame.txt\r
+22. *=* UpdateSame.txt\r
+23. .!* UpdateWork.txt\r
+24. .!* UpdateWorkAlmostSame.txt\r
+25. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\DeleteBaseFromBoth.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\DeleteBaseFromBoth.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: DeleteBaseFromBoth.txt (-\8dí\8f\9c)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: DeleteBaseFromBoth.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (-\8dí\8f\9c) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
\r
\81\9a[WARNING] \83x\81[\83X\82Æ\83\8f\81[\83N\82Å\93à\97e\82ª\93¯\82¶\82¾\82Á\82½\82Ì\82ª\88Ù\82È\82é\82æ\82¤\82É\82È\82è\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\DeleteBaseFromBoth.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\DeleteBaseFromBoth.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: DeleteBaseFromBoth.txt ( \82È\82µ)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: DeleteBaseFromBoth.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. - DeleteBaseFromOnly.txt\r
-2. - - DeleteBoth.txt\r
-3. .!- DeleteWorkFromBoth.txt\r
-4. - DeleteWorkFromOnly.txt\r
-5. +! NewBase.txt\r
-6. +!+ NewNotSame.txt\r
-7. +=+ NewSame.txt\r
-8. !+ NewWork.txt\r
-9. - SubForWork\DeleteBaseFromOnly.txt\r
-10. - - SubForWork\DeleteBoth.txt\r
-11. - SubForWork\DeleteWorkFromOnly.txt\r
-12. *!. SubForWork\UpdateBase.txt\r
-13. *! SubForWork\UpdateBothSame_ForBase.txt\r
-14. !* SubForWork\UpdateBothSame_ForWork.txt\r
-15. .!* SubForWork\UpdateWork.txt\r
-16. *!. UpdateBase.txt\r
-17. *!* UpdateBoth.txt\r
-18. *=* UpdateSame.txt\r
-19. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. - DeleteBaseFromOnly.txt\r
+2. - - DeleteBoth.txt\r
+3. .!- DeleteWorkFromBoth.txt\r
+4. - DeleteWorkFromOnly.txt\r
+5. +! NewBase.txt\r
+6. +!+ NewNotSame.txt\r
+7. +=+ NewSame.txt\r
+8. !+ NewWork.txt\r
+9. - SubForWork\DeleteBaseFromOnly.txt\r
+10. - - SubForWork\DeleteBoth.txt\r
+11. - SubForWork\DeleteWorkFromOnly.txt\r
+12. *!. SubForWork\UpdateBase.txt\r
+13. *! SubForWork\UpdateBothSame_ForBase.txt\r
+14. !* SubForWork\UpdateBothSame_ForWork.txt\r
+15. .!* SubForWork\UpdateWork.txt\r
+16. *!. UpdateBase.txt\r
+17. *!. UpdateBaseAlmostSame.txt\r
+18. *=. UpdateBaseAlmostSameToSame.txt\r
+19. *!* UpdateBoth.txt\r
+20. *!* UpdateBothAlmostSame.txt\r
+21. *=* UpdateSame.txt\r
+22. .!* UpdateWork.txt\r
+23. .!* UpdateWorkAlmostSame.txt\r
+24. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\DeleteBaseFromOnly.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\DeleteBaseFromOnly.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: DeleteBaseFromOnly.txt (-\8dí\8f\9c)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: DeleteBaseFromOnly.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (-\8dí\8f\9c) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>del "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteBaseFromOnly.txt"\r
\81\9a\83\8f\81[\83N\81iWORK\81j: DeleteBaseFromOnly.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. - - DeleteBoth.txt\r
-2. .!- DeleteWorkFromBoth.txt\r
-3. - DeleteWorkFromOnly.txt\r
-4. +! NewBase.txt\r
-5. +!+ NewNotSame.txt\r
-6. +=+ NewSame.txt\r
-7. !+ NewWork.txt\r
-8. - SubForWork\DeleteBaseFromOnly.txt\r
-9. - - SubForWork\DeleteBoth.txt\r
-10. - SubForWork\DeleteWorkFromOnly.txt\r
-11. *!. SubForWork\UpdateBase.txt\r
-12. *! SubForWork\UpdateBothSame_ForBase.txt\r
-13. !* SubForWork\UpdateBothSame_ForWork.txt\r
-14. .!* SubForWork\UpdateWork.txt\r
-15. *!. UpdateBase.txt\r
-16. *!* UpdateBoth.txt\r
-17. *=* UpdateSame.txt\r
-18. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. - - DeleteBoth.txt\r
+2. .!- DeleteWorkFromBoth.txt\r
+3. - DeleteWorkFromOnly.txt\r
+4. +! NewBase.txt\r
+5. +!+ NewNotSame.txt\r
+6. +=+ NewSame.txt\r
+7. !+ NewWork.txt\r
+8. - SubForWork\DeleteBaseFromOnly.txt\r
+9. - - SubForWork\DeleteBoth.txt\r
+10. - SubForWork\DeleteWorkFromOnly.txt\r
+11. *!. SubForWork\UpdateBase.txt\r
+12. *! SubForWork\UpdateBothSame_ForBase.txt\r
+13. !* SubForWork\UpdateBothSame_ForWork.txt\r
+14. .!* SubForWork\UpdateWork.txt\r
+15. *!. UpdateBase.txt\r
+16. *!. UpdateBaseAlmostSame.txt\r
+17. *=. UpdateBaseAlmostSameToSame.txt\r
+18. *!* UpdateBoth.txt\r
+19. *!* UpdateBothAlmostSame.txt\r
+20. *=* UpdateSame.txt\r
+21. .!* UpdateWork.txt\r
+22. .!* UpdateWorkAlmostSame.txt\r
+23. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\DeleteBoth.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\DeleteBoth.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: DeleteBoth.txt (-\8dí\8f\9c)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: DeleteBoth.txt (-\8dí\8f\9c)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (-\8dí\8f\9c) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (-\8dí\8f\9c) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>del "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteBoth.txt"\r
\81\9a\83\8f\81[\83N\81iWORK\81j: DeleteBoth.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. .!- DeleteWorkFromBoth.txt\r
-2. - DeleteWorkFromOnly.txt\r
-3. +! NewBase.txt\r
-4. +!+ NewNotSame.txt\r
-5. +=+ NewSame.txt\r
-6. !+ NewWork.txt\r
-7. - SubForWork\DeleteBaseFromOnly.txt\r
-8. - - SubForWork\DeleteBoth.txt\r
-9. - SubForWork\DeleteWorkFromOnly.txt\r
-10. *!. SubForWork\UpdateBase.txt\r
-11. *! SubForWork\UpdateBothSame_ForBase.txt\r
-12. !* SubForWork\UpdateBothSame_ForWork.txt\r
-13. .!* SubForWork\UpdateWork.txt\r
-14. *!. UpdateBase.txt\r
-15. *!* UpdateBoth.txt\r
-16. *=* UpdateSame.txt\r
-17. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. .!- DeleteWorkFromBoth.txt\r
+2. - DeleteWorkFromOnly.txt\r
+3. +! NewBase.txt\r
+4. +!+ NewNotSame.txt\r
+5. +=+ NewSame.txt\r
+6. !+ NewWork.txt\r
+7. - SubForWork\DeleteBaseFromOnly.txt\r
+8. - - SubForWork\DeleteBoth.txt\r
+9. - SubForWork\DeleteWorkFromOnly.txt\r
+10. *!. SubForWork\UpdateBase.txt\r
+11. *! SubForWork\UpdateBothSame_ForBase.txt\r
+12. !* SubForWork\UpdateBothSame_ForWork.txt\r
+13. .!* SubForWork\UpdateWork.txt\r
+14. *!. UpdateBase.txt\r
+15. *!. UpdateBaseAlmostSame.txt\r
+16. *=. UpdateBaseAlmostSameToSame.txt\r
+17. *!* UpdateBoth.txt\r
+18. *!* UpdateBothAlmostSame.txt\r
+19. *=* UpdateSame.txt\r
+20. .!* UpdateWork.txt\r
+21. .!* UpdateWorkAlmostSame.txt\r
+22. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\DeleteWorkFromBoth.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\DeleteWorkFromBoth.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: DeleteWorkFromBoth.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: DeleteWorkFromBoth.txt (-\8dí\8f\9c)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (-\8dí\8f\9c) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
\r
\81\9a[WARNING] \83x\81[\83X\82Æ\83\8f\81[\83N\82Å\93à\97e\82ª\93¯\82¶\82¾\82Á\82½\82Ì\82ª\88Ù\82È\82é\82æ\82¤\82É\82È\82è\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\DeleteWorkFromBoth.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\DeleteWorkFromBoth.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: DeleteWorkFromBoth.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: DeleteWorkFromBoth.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. - DeleteWorkFromOnly.txt\r
-2. +! NewBase.txt\r
-3. +!+ NewNotSame.txt\r
-4. +=+ NewSame.txt\r
-5. !+ NewWork.txt\r
-6. - SubForWork\DeleteBaseFromOnly.txt\r
-7. - - SubForWork\DeleteBoth.txt\r
-8. - SubForWork\DeleteWorkFromOnly.txt\r
-9. *!. SubForWork\UpdateBase.txt\r
-10. *! SubForWork\UpdateBothSame_ForBase.txt\r
-11. !* SubForWork\UpdateBothSame_ForWork.txt\r
-12. .!* SubForWork\UpdateWork.txt\r
-13. *!. UpdateBase.txt\r
-14. *!* UpdateBoth.txt\r
-15. *=* UpdateSame.txt\r
-16. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. - DeleteWorkFromOnly.txt\r
+2. +! NewBase.txt\r
+3. +!+ NewNotSame.txt\r
+4. +=+ NewSame.txt\r
+5. !+ NewWork.txt\r
+6. - SubForWork\DeleteBaseFromOnly.txt\r
+7. - - SubForWork\DeleteBoth.txt\r
+8. - SubForWork\DeleteWorkFromOnly.txt\r
+9. *!. SubForWork\UpdateBase.txt\r
+10. *! SubForWork\UpdateBothSame_ForBase.txt\r
+11. !* SubForWork\UpdateBothSame_ForWork.txt\r
+12. .!* SubForWork\UpdateWork.txt\r
+13. *!. UpdateBase.txt\r
+14. *!. UpdateBaseAlmostSame.txt\r
+15. *=. UpdateBaseAlmostSameToSame.txt\r
+16. *!* UpdateBoth.txt\r
+17. *!* UpdateBothAlmostSame.txt\r
+18. *=* UpdateSame.txt\r
+19. .!* UpdateWork.txt\r
+20. .!* UpdateWorkAlmostSame.txt\r
+21. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\DeleteWorkFromOnly.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\DeleteWorkFromOnly.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: DeleteWorkFromOnly.txt ( \82È\82µ)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: DeleteWorkFromOnly.txt (-\8dí\8f\9c)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (-\8dí\8f\9c) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>del "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteWorkFromOnly.txt"\r
\81\9a\83\8f\81[\83N\81iWORK\81j: DeleteWorkFromOnly.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. +! NewBase.txt\r
-2. +!+ NewNotSame.txt\r
-3. +=+ NewSame.txt\r
-4. !+ NewWork.txt\r
-5. - SubForWork\DeleteBaseFromOnly.txt\r
-6. - - SubForWork\DeleteBoth.txt\r
-7. - SubForWork\DeleteWorkFromOnly.txt\r
-8. *!. SubForWork\UpdateBase.txt\r
-9. *! SubForWork\UpdateBothSame_ForBase.txt\r
-10. !* SubForWork\UpdateBothSame_ForWork.txt\r
-11. .!* SubForWork\UpdateWork.txt\r
-12. *!. UpdateBase.txt\r
-13. *!* UpdateBoth.txt\r
-14. *=* UpdateSame.txt\r
-15. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. +! NewBase.txt\r
+2. +!+ NewNotSame.txt\r
+3. +=+ NewSame.txt\r
+4. !+ NewWork.txt\r
+5. - SubForWork\DeleteBaseFromOnly.txt\r
+6. - - SubForWork\DeleteBoth.txt\r
+7. - SubForWork\DeleteWorkFromOnly.txt\r
+8. *!. SubForWork\UpdateBase.txt\r
+9. *! SubForWork\UpdateBothSame_ForBase.txt\r
+10. !* SubForWork\UpdateBothSame_ForWork.txt\r
+11. .!* SubForWork\UpdateWork.txt\r
+12. *!. UpdateBase.txt\r
+13. *!. UpdateBaseAlmostSame.txt\r
+14. *=. UpdateBaseAlmostSameToSame.txt\r
+15. *!* UpdateBoth.txt\r
+16. *!* UpdateBothAlmostSame.txt\r
+17. *=* UpdateSame.txt\r
+18. .!* UpdateWork.txt\r
+19. .!* UpdateWorkAlmostSame.txt\r
+20. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\NewBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\NewBase.txt"\r
\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: NewBase.txt (+\90V\8bK)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: NewBase.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (+\90V\8bK) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>del "%FullPath(..)%\FilesA\Project - Synced\Work\NewBase.txt"\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\NewBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\NewBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: NewBase.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: NewBase.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. +!+ NewNotSame.txt\r
-2. +=+ NewSame.txt\r
-3. !+ NewWork.txt\r
-4. - SubForWork\DeleteBaseFromOnly.txt\r
-5. - - SubForWork\DeleteBoth.txt\r
-6. - SubForWork\DeleteWorkFromOnly.txt\r
-7. *!. SubForWork\UpdateBase.txt\r
-8. *! SubForWork\UpdateBothSame_ForBase.txt\r
-9. !* SubForWork\UpdateBothSame_ForWork.txt\r
-10. .!* SubForWork\UpdateWork.txt\r
-11. *!. UpdateBase.txt\r
-12. *!* UpdateBoth.txt\r
-13. *=* UpdateSame.txt\r
-14. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. +!+ NewNotSame.txt\r
+2. +=+ NewSame.txt\r
+3. !+ NewWork.txt\r
+4. - SubForWork\DeleteBaseFromOnly.txt\r
+5. - - SubForWork\DeleteBoth.txt\r
+6. - SubForWork\DeleteWorkFromOnly.txt\r
+7. *!. SubForWork\UpdateBase.txt\r
+8. *! SubForWork\UpdateBothSame_ForBase.txt\r
+9. !* SubForWork\UpdateBothSame_ForWork.txt\r
+10. .!* SubForWork\UpdateWork.txt\r
+11. *!. UpdateBase.txt\r
+12. *!. UpdateBaseAlmostSame.txt\r
+13. *=. UpdateBaseAlmostSameToSame.txt\r
+14. *!* UpdateBoth.txt\r
+15. *!* UpdateBothAlmostSame.txt\r
+16. *=* UpdateSame.txt\r
+17. .!* UpdateWork.txt\r
+18. .!* UpdateWorkAlmostSame.txt\r
+19. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\NewNotSame.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\NewNotSame.txt"\r
\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: NewNotSame.txt (+\90V\8bK)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: NewNotSame.txt (+\90V\8bK)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (+\90V\8bK) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (+\90V\8bK) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>copy_ren "%FullPath(..)%\FilesA\Project\Work\NewNotSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\NewNotSame.txt"\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\NewNotSame.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\NewNotSame.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: NewNotSame.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: NewNotSame.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. +=+ NewSame.txt\r
-2. !+ NewWork.txt\r
-3. - SubForWork\DeleteBaseFromOnly.txt\r
-4. - - SubForWork\DeleteBoth.txt\r
-5. - SubForWork\DeleteWorkFromOnly.txt\r
-6. *!. SubForWork\UpdateBase.txt\r
-7. *! SubForWork\UpdateBothSame_ForBase.txt\r
-8. !* SubForWork\UpdateBothSame_ForWork.txt\r
-9. .!* SubForWork\UpdateWork.txt\r
-10. *!. UpdateBase.txt\r
-11. *!* UpdateBoth.txt\r
-12. *=* UpdateSame.txt\r
-13. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. +=+ NewSame.txt\r
+2. !+ NewWork.txt\r
+3. - SubForWork\DeleteBaseFromOnly.txt\r
+4. - - SubForWork\DeleteBoth.txt\r
+5. - SubForWork\DeleteWorkFromOnly.txt\r
+6. *!. SubForWork\UpdateBase.txt\r
+7. *! SubForWork\UpdateBothSame_ForBase.txt\r
+8. !* SubForWork\UpdateBothSame_ForWork.txt\r
+9. .!* SubForWork\UpdateWork.txt\r
+10. *!. UpdateBase.txt\r
+11. *!. UpdateBaseAlmostSame.txt\r
+12. *=. UpdateBaseAlmostSameToSame.txt\r
+13. *!* UpdateBoth.txt\r
+14. *!* UpdateBothAlmostSame.txt\r
+15. *=* UpdateSame.txt\r
+16. .!* UpdateWork.txt\r
+17. .!* UpdateWorkAlmostSame.txt\r
+18. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\NewSame.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\NewSame.txt"\r
\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: NewSame.txt (+\90V\8bK)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: NewSame.txt (+\90V\8bK)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (+\90V\8bK) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (+\90V\8bK) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>copy_ren "%FullPath(..)%\FilesA\Project\Work\NewSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\NewSame.txt"\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\NewSame.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\NewSame.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: NewSame.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: NewSame.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. !+ NewWork.txt\r
-2. - SubForWork\DeleteBaseFromOnly.txt\r
-3. - - SubForWork\DeleteBoth.txt\r
-4. - SubForWork\DeleteWorkFromOnly.txt\r
-5. *!. SubForWork\UpdateBase.txt\r
-6. *! SubForWork\UpdateBothSame_ForBase.txt\r
-7. !* SubForWork\UpdateBothSame_ForWork.txt\r
-8. .!* SubForWork\UpdateWork.txt\r
-9. *!. UpdateBase.txt\r
-10. *!* UpdateBoth.txt\r
-11. *=* UpdateSame.txt\r
-12. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. !+ NewWork.txt\r
+2. - SubForWork\DeleteBaseFromOnly.txt\r
+3. - - SubForWork\DeleteBoth.txt\r
+4. - SubForWork\DeleteWorkFromOnly.txt\r
+5. *!. SubForWork\UpdateBase.txt\r
+6. *! SubForWork\UpdateBothSame_ForBase.txt\r
+7. !* SubForWork\UpdateBothSame_ForWork.txt\r
+8. .!* SubForWork\UpdateWork.txt\r
+9. *!. UpdateBase.txt\r
+10. *!. UpdateBaseAlmostSame.txt\r
+11. *=. UpdateBaseAlmostSameToSame.txt\r
+12. *!* UpdateBoth.txt\r
+13. *!* UpdateBothAlmostSame.txt\r
+14. *=* UpdateSame.txt\r
+15. .!* UpdateWork.txt\r
+16. .!* UpdateWorkAlmostSame.txt\r
+17. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\NewWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\NewWork.txt"\r
\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: NewWork.txt ( \82È\82µ)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: NewWork.txt (+\90V\8bK)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (+\90V\8bK) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>copy_ren "%FullPath(..)%\FilesA\Project\Work\NewWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\NewWork.txt"\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\NewWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\NewWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: NewWork.txt ( \82È\82µ)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: NewWork.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. - SubForWork\DeleteBaseFromOnly.txt\r
-2. - - SubForWork\DeleteBoth.txt\r
-3. - SubForWork\DeleteWorkFromOnly.txt\r
-4. *!. SubForWork\UpdateBase.txt\r
-5. *! SubForWork\UpdateBothSame_ForBase.txt\r
-6. !* SubForWork\UpdateBothSame_ForWork.txt\r
-7. .!* SubForWork\UpdateWork.txt\r
-8. *!. UpdateBase.txt\r
-9. *!* UpdateBoth.txt\r
-10. *=* UpdateSame.txt\r
-11. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. - SubForWork\DeleteBaseFromOnly.txt\r
+2. - - SubForWork\DeleteBoth.txt\r
+3. - SubForWork\DeleteWorkFromOnly.txt\r
+4. *!. SubForWork\UpdateBase.txt\r
+5. *! SubForWork\UpdateBothSame_ForBase.txt\r
+6. !* SubForWork\UpdateBothSame_ForWork.txt\r
+7. .!* SubForWork\UpdateWork.txt\r
+8. *!. UpdateBase.txt\r
+9. *!. UpdateBaseAlmostSame.txt\r
+10. *=. UpdateBaseAlmostSameToSame.txt\r
+11. *!* UpdateBoth.txt\r
+12. *!* UpdateBothAlmostSame.txt\r
+13. *=* UpdateSame.txt\r
+14. .!* UpdateWork.txt\r
+15. .!* UpdateWorkAlmostSame.txt\r
+16. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\DeleteBaseFromOnly.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\DeleteBaseFromOnly.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\DeleteBaseFromOnly.txt (-\8dí\8f\9c)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\DeleteBaseFromOnly.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (-\8dí\8f\9c) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>del "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\DeleteBaseFromOnly.txt"\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\DeleteBaseFromOnly.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. - - SubForWork\DeleteBoth.txt\r
-2. - SubForWork\DeleteWorkFromOnly.txt\r
-3. *!. SubForWork\UpdateBase.txt\r
-4. *! SubForWork\UpdateBothSame_ForBase.txt\r
-5. !* SubForWork\UpdateBothSame_ForWork.txt\r
-6. .!* SubForWork\UpdateWork.txt\r
-7. *!. UpdateBase.txt\r
-8. *!* UpdateBoth.txt\r
-9. *=* UpdateSame.txt\r
-10. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. - - SubForWork\DeleteBoth.txt\r
+2. - SubForWork\DeleteWorkFromOnly.txt\r
+3. *!. SubForWork\UpdateBase.txt\r
+4. *! SubForWork\UpdateBothSame_ForBase.txt\r
+5. !* SubForWork\UpdateBothSame_ForWork.txt\r
+6. .!* SubForWork\UpdateWork.txt\r
+7. *!. UpdateBase.txt\r
+8. *!. UpdateBaseAlmostSame.txt\r
+9. *=. UpdateBaseAlmostSameToSame.txt\r
+10. *!* UpdateBoth.txt\r
+11. *!* UpdateBothAlmostSame.txt\r
+12. *=* UpdateSame.txt\r
+13. .!* UpdateWork.txt\r
+14. .!* UpdateWorkAlmostSame.txt\r
+15. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\DeleteBoth.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\DeleteBoth.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\DeleteBoth.txt (-\8dí\8f\9c)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\DeleteBoth.txt (-\8dí\8f\9c)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (-\8dí\8f\9c) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (-\8dí\8f\9c) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>del "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\DeleteBoth.txt"\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\DeleteBoth.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. - SubForWork\DeleteWorkFromOnly.txt\r
-2. *!. SubForWork\UpdateBase.txt\r
-3. *! SubForWork\UpdateBothSame_ForBase.txt\r
-4. !* SubForWork\UpdateBothSame_ForWork.txt\r
-5. .!* SubForWork\UpdateWork.txt\r
-6. *!. UpdateBase.txt\r
-7. *!* UpdateBoth.txt\r
-8. *=* UpdateSame.txt\r
-9. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. - SubForWork\DeleteWorkFromOnly.txt\r
+2. *!. SubForWork\UpdateBase.txt\r
+3. *! SubForWork\UpdateBothSame_ForBase.txt\r
+4. !* SubForWork\UpdateBothSame_ForWork.txt\r
+5. .!* SubForWork\UpdateWork.txt\r
+6. *!. UpdateBase.txt\r
+7. *!. UpdateBaseAlmostSame.txt\r
+8. *=. UpdateBaseAlmostSameToSame.txt\r
+9. *!* UpdateBoth.txt\r
+10. *!* UpdateBothAlmostSame.txt\r
+11. *=* UpdateSame.txt\r
+12. .!* UpdateWork.txt\r
+13. .!* UpdateWorkAlmostSame.txt\r
+14. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\DeleteWorkFromOnly.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\DeleteWorkFromOnly.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\DeleteWorkFromOnly.txt ( \82È\82µ)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\DeleteWorkFromOnly.txt (-\8dí\8f\9c)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (-\8dí\8f\9c) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
9. \96ß\82é\r
+\81\9a\89ü\96¼\81E\8c\8b\8d\87\81E\95ª\97£\81E\95\94\95ª\88Ú\93®\82ª\82 \82Á\82½\82Æ\82«\82Ì SyncFilesX \82Ì\90à\96¾\82ð\8eQ\8dl\81B\r
\94Ô\8d\86 >8\r
-------------------------------------------------------------------------------\r
>del "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\DeleteWorkFromOnly.txt"\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\DeleteWorkFromOnly.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e ( \82È\82µ) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. *!. SubForWork\UpdateBase.txt\r
-2. *! SubForWork\UpdateBothSame_ForBase.txt\r
-3. !* SubForWork\UpdateBothSame_ForWork.txt\r
-4. .!* SubForWork\UpdateWork.txt\r
-5. *!. UpdateBase.txt\r
-6. *!* UpdateBoth.txt\r
-7. *=* UpdateSame.txt\r
-8. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. *!. SubForWork\UpdateBase.txt\r
+2. *! SubForWork\UpdateBothSame_ForBase.txt\r
+3. !* SubForWork\UpdateBothSame_ForWork.txt\r
+4. .!* SubForWork\UpdateWork.txt\r
+5. *!. UpdateBase.txt\r
+6. *!. UpdateBaseAlmostSame.txt\r
+7. *=. UpdateBaseAlmostSameToSame.txt\r
+8. *!* UpdateBoth.txt\r
+9. *!* UpdateBothAlmostSame.txt\r
+10. *=* UpdateSame.txt\r
+11. .!* UpdateWork.txt\r
+12. .!* UpdateWorkAlmostSame.txt\r
+13. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\UpdateBase.txt (*\95Ï\8dX)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\UpdateBase.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\UpdateBase.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\UpdateBase.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. *! SubForWork\UpdateBothSame_ForBase.txt\r
-2. !* SubForWork\UpdateBothSame_ForWork.txt\r
-3. .!* SubForWork\UpdateWork.txt\r
-4. *!. UpdateBase.txt\r
-5. *!* UpdateBoth.txt\r
-6. *=* UpdateSame.txt\r
-7. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. *! SubForWork\UpdateBothSame_ForBase.txt\r
+2. !* SubForWork\UpdateBothSame_ForWork.txt\r
+3. .!* SubForWork\UpdateWork.txt\r
+4. *!. UpdateBase.txt\r
+5. *!. UpdateBaseAlmostSame.txt\r
+6. *=. UpdateBaseAlmostSameToSame.txt\r
+7. *!* UpdateBoth.txt\r
+8. *!* UpdateBothAlmostSame.txt\r
+9. *=* UpdateSame.txt\r
+10. .!* UpdateWork.txt\r
+11. .!* UpdateWorkAlmostSame.txt\r
+12. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\UpdateBothSame_ForBase.txt (*\95Ï\8dX)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\UpdateBothSame_ForBase.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\UpdateBothSame_ForBase.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\UpdateBothSame_ForBase.txt ( \82È\82µ)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. !* SubForWork\UpdateBothSame_ForWork.txt\r
-2. .!* SubForWork\UpdateWork.txt\r
-3. *!. UpdateBase.txt\r
-4. *!* UpdateBoth.txt\r
-5. *=* UpdateSame.txt\r
-6. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. !* SubForWork\UpdateBothSame_ForWork.txt\r
+2. .!* SubForWork\UpdateWork.txt\r
+3. *!. UpdateBase.txt\r
+4. *!. UpdateBaseAlmostSame.txt\r
+5. *=. UpdateBaseAlmostSameToSame.txt\r
+6. *!* UpdateBoth.txt\r
+7. *!* UpdateBothAlmostSame.txt\r
+8. *=* UpdateSame.txt\r
+9. .!* UpdateWork.txt\r
+10. .!* UpdateWorkAlmostSame.txt\r
+11. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\UpdateBothSame_ForWork.txt ( \82È\82µ)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\UpdateBothSame_ForWork.txt (*\95Ï\8dX)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\UpdateBothSame_ForWork.txt ( \82È\82µ)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\UpdateBothSame_ForWork.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X ( \82È\82µ) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. .!* SubForWork\UpdateWork.txt\r
-2. *!. UpdateBase.txt\r
-3. *!* UpdateBoth.txt\r
-4. *=* UpdateSame.txt\r
-5. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. .!* SubForWork\UpdateWork.txt\r
+2. *!. UpdateBase.txt\r
+3. *!. UpdateBaseAlmostSame.txt\r
+4. *=. UpdateBaseAlmostSameToSame.txt\r
+5. *!* UpdateBoth.txt\r
+6. *!* UpdateBothAlmostSame.txt\r
+7. *=* UpdateSame.txt\r
+8. .!* UpdateWork.txt\r
+9. .!* UpdateWorkAlmostSame.txt\r
+10. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\UpdateWork.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\UpdateWork.txt (*\95Ï\8dX)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\UpdateWork.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\UpdateWork.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. *!. UpdateBase.txt\r
-2. *!* UpdateBoth.txt\r
-3. *=* UpdateSame.txt\r
-4. .!* UpdateWork.txt\r
-\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. *!. UpdateBase.txt\r
+2. *!. UpdateBaseAlmostSame.txt\r
+3. *=. UpdateBaseAlmostSameToSame.txt\r
+4. *!* UpdateBoth.txt\r
+5. *!* UpdateBothAlmostSame.txt\r
+6. *=* UpdateSame.txt\r
+7. .!* UpdateWork.txt\r
+8. .!* UpdateWorkAlmostSame.txt\r
+9. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: UpdateBase.txt (*\95Ï\8dX)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateBase.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBase.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: UpdateBase.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateBase.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. *!* UpdateBoth.txt\r
-2. *=* UpdateSame.txt\r
-3. .!* UpdateWork.txt\r
+1. *!. UpdateBaseAlmostSame.txt\r
+2. *=. UpdateBaseAlmostSameToSame.txt\r
+3. *!* UpdateBoth.txt\r
+4. *!* UpdateBothAlmostSame.txt\r
+5. *=* UpdateSame.txt\r
+6. .!* UpdateWork.txt\r
+7. .!* UpdateWorkAlmostSame.txt\r
+8. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
+92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
+99. \8fI\97¹\r
+\94Ô\8d\86 >1\r
+-------------------------------------------------------------------------------\r
+\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSame.txt"\r
+\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSame.txt"\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+-------------------------------------------------------------------------------\r
+\81\9a\83x\81[\83X\81iBASE\81j: UpdateBaseAlmostSame.txt (*\95Ï\8dX)\r
+\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateBaseAlmostSame.txt (.\95s\95Ï)\r
+\r
+1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+4. Diff \82Å\8aJ\82\81F\83x\81[\83X (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
+55.Diff \82Å\8aJ\82\81F[ \83x\81[\83X / \83\8f\81[\83N / \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N ]\r
+6. \83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
+9. \96ß\82é\r
+\94Ô\8d\86 >8\r
+-------------------------------------------------------------------------------\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateBaseAlmostSame.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateBaseAlmostSame.txt"\r
+\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
+-------------------------------------------------------------------------------\r
+\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSame.txt"\r
+\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSame.txt"\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
+-------------------------------------------------------------------------------\r
+\81\9a\83x\81[\83X\81iBASE\81j: UpdateBaseAlmostSame.txt (.\95s\95Ï)\r
+\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateBaseAlmostSame.txt (.\95s\95Ï)\r
+\r
+1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
+55.Diff \82Å\8aJ\82\81F[ \83x\81[\83X / \83\8f\81[\83N / \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N ]\r
+6. \83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
+9. \96ß\82é\r
+\94Ô\8d\86 >9\r
+-------------------------------------------------------------------------------\r
+%FullPath(..)%\FilesA\Project - Synced\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
+-------------------------------------------------------------------------------\r
+\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
+\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
+1. *=. UpdateBaseAlmostSameToSame.txt\r
+2. *!* UpdateBoth.txt\r
+3. *!* UpdateBothAlmostSame.txt\r
+4. *=* UpdateSame.txt\r
+5. .!* UpdateWork.txt\r
+6. .!* UpdateWorkAlmostSame.txt\r
+7. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
+92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
+99. \8fI\97¹\r
+\94Ô\8d\86 >1\r
+-------------------------------------------------------------------------------\r
+\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSameToSame.txt"\r
+\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSameToSame.txt"\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+-------------------------------------------------------------------------------\r
+\81\9a\83x\81[\83X\81iBASE\81j: UpdateBaseAlmostSameToSame.txt (*\95Ï\8dX)\r
+\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateBaseAlmostSameToSame.txt (.\95s\95Ï)\r
+\r
+1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+4. Diff \82Å\8aJ\82\81F\83x\81[\83X (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
+55.Diff \82Å\8aJ\82\81F[ \83x\81[\83X / \83\8f\81[\83N / \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N ]\r
+6. \83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
+9. \96ß\82é\r
+\94Ô\8d\86 >8\r
+\r
+\81\9a[WARNING] \83x\81[\83X\82Æ\83\8f\81[\83N\82Å\93à\97e\82ª\88Ù\82È\82Á\82Ä\82¢\82½\82Ì\82ª\93¯\82¶\82É\82È\82è\82Ü\82µ\82½\81B\r
+\r
+\8cx\8d\90\82ª\82 \82è\82Ü\82µ\82½\82ª\81A\82æ\82ë\82µ\82¢\82Å\82·\82©(y/n)y\r
+-------------------------------------------------------------------------------\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSameToSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateBaseAlmostSameToSame.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSameToSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateBaseAlmostSameToSame.txt"\r
+\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
+-------------------------------------------------------------------------------\r
+\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSameToSame.txt"\r
+\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSameToSame.txt"\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
+-------------------------------------------------------------------------------\r
+\81\9a\83x\81[\83X\81iBASE\81j: UpdateBaseAlmostSameToSame.txt (.\95s\95Ï)\r
+\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateBaseAlmostSameToSame.txt (.\95s\95Ï)\r
\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
+55.Diff \82Å\8aJ\82\81F[ \83x\81[\83X / \83\8f\81[\83N / \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N ]\r
+6. \83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
+9. \96ß\82é\r
+\94Ô\8d\86 >9\r
+-------------------------------------------------------------------------------\r
+%FullPath(..)%\FilesA\Project - Synced\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
+-------------------------------------------------------------------------------\r
+\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
+\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
+1. *!* UpdateBoth.txt\r
+2. *!* UpdateBothAlmostSame.txt\r
+3. *=* UpdateSame.txt\r
+4. .!* UpdateWork.txt\r
+5. .!* UpdateWorkAlmostSame.txt\r
+6. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBoth.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBoth.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: UpdateBoth.txt (*\95Ï\8dX)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateBoth.txt (*\95Ï\8dX)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBoth.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBoth.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: UpdateBoth.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateBoth.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. *=* UpdateSame.txt\r
-2. .!* UpdateWork.txt\r
+1. *!* UpdateBothAlmostSame.txt\r
+2. *=* UpdateSame.txt\r
+3. .!* UpdateWork.txt\r
+4. .!* UpdateWorkAlmostSame.txt\r
+5. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
+92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
+99. \8fI\97¹\r
+\94Ô\8d\86 >1\r
+-------------------------------------------------------------------------------\r
+\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBothAlmostSame.txt"\r
+\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBothAlmostSame.txt"\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+-------------------------------------------------------------------------------\r
+\81\9a\83x\81[\83X\81iBASE\81j: UpdateBothAlmostSame.txt (*\95Ï\8dX)\r
+\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateBothAlmostSame.txt (*\95Ï\8dX)\r
\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+4. Diff \82Å\8aJ\82\81F\83x\81[\83X (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
+55.Diff \82Å\8aJ\82\81F[ \83x\81[\83X / \83\8f\81[\83N / \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N ]\r
+6. \83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
+9. \96ß\82é\r
+\94Ô\8d\86 >8\r
+-------------------------------------------------------------------------------\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateBothAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateBothAlmostSame.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateBothAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateBothAlmostSame.txt"\r
+\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
+-------------------------------------------------------------------------------\r
+\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBothAlmostSame.txt"\r
+\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBothAlmostSame.txt"\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
+-------------------------------------------------------------------------------\r
+\81\9a\83x\81[\83X\81iBASE\81j: UpdateBothAlmostSame.txt (.\95s\95Ï)\r
+\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateBothAlmostSame.txt (.\95s\95Ï)\r
+\r
+1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
+55.Diff \82Å\8aJ\82\81F[ \83x\81[\83X / \83\8f\81[\83N / \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N ]\r
+6. \83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
+9. \96ß\82é\r
+\94Ô\8d\86 >9\r
+-------------------------------------------------------------------------------\r
+%FullPath(..)%\FilesA\Project - Synced\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
+-------------------------------------------------------------------------------\r
+\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
+\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
+1. *=* UpdateSame.txt\r
+2. .!* UpdateWork.txt\r
+3. .!* UpdateWorkAlmostSame.txt\r
+4. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateSame.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateSame.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: UpdateSame.txt (*\95Ï\8dX)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateSame.txt (*\95Ï\8dX)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateSame.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateSame.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: UpdateSame.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateSame.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. .!* UpdateWork.txt\r
+1. .!* UpdateWork.txt\r
+2. .!* UpdateWorkAlmostSame.txt\r
+3. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
99. \8fI\97¹\r
\94Ô\8d\86 >1\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: UpdateWork.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateWork.txt (*\95Ï\8dX)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWork.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: UpdateWork.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateWork.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
+55.Diff \82Å\8aJ\82\81F[ \83x\81[\83X / \83\8f\81[\83N / \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N ]\r
+6. \83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
+9. \96ß\82é\r
+\94Ô\8d\86 >9\r
+-------------------------------------------------------------------------------\r
+%FullPath(..)%\FilesA\Project - Synced\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
+-------------------------------------------------------------------------------\r
+\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
+\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
+1. .!* UpdateWorkAlmostSame.txt\r
+2. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
+92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
+99. \8fI\97¹\r
+\94Ô\8d\86 >1\r
+-------------------------------------------------------------------------------\r
+\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSame.txt"\r
+\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSame.txt"\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+-------------------------------------------------------------------------------\r
+\81\9a\83x\81[\83X\81iBASE\81j: UpdateWorkAlmostSame.txt (.\95s\95Ï)\r
+\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateWorkAlmostSame.txt (*\95Ï\8dX)\r
+\r
+1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
+55.Diff \82Å\8aJ\82\81F[ \83x\81[\83X / \83\8f\81[\83N / \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N ]\r
+6. \83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
+9. \96ß\82é\r
+\94Ô\8d\86 >8\r
+-------------------------------------------------------------------------------\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateWorkAlmostSame.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateWorkAlmostSame.txt"\r
+\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
+-------------------------------------------------------------------------------\r
+\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSame.txt"\r
+\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSame.txt"\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
+-------------------------------------------------------------------------------\r
+\81\9a\83x\81[\83X\81iBASE\81j: UpdateWorkAlmostSame.txt (.\95s\95Ï)\r
+\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateWorkAlmostSame.txt (.\95s\95Ï)\r
+\r
+1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
+55.Diff \82Å\8aJ\82\81F[ \83x\81[\83X / \83\8f\81[\83N / \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N ]\r
+6. \83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
+9. \96ß\82é\r
+\94Ô\8d\86 >9\r
+-------------------------------------------------------------------------------\r
+%FullPath(..)%\FilesA\Project - Synced\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
+-------------------------------------------------------------------------------\r
+\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
+\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
+1. .=* UpdateWorkAlmostSameToSame.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
+92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+98. \81\9a \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é [AutoCommit]\r
+99. \8fI\97¹\r
+\94Ô\8d\86 >1\r
+-------------------------------------------------------------------------------\r
+\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSameToSame.txt"\r
+\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSameToSame.txt"\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\88Ù\82È\82é\93à\97e\81v\82Å\82µ\82½\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+-------------------------------------------------------------------------------\r
+\81\9a\83x\81[\83X\81iBASE\81j: UpdateWorkAlmostSameToSame.txt (.\95s\95Ï)\r
+\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateWorkAlmostSameToSame.txt (*\95Ï\8dX)\r
+\r
+1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (!\88Ù\82È\82é) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
+44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
+55.Diff \82Å\8aJ\82\81F[ \83x\81[\83X / \83\8f\81[\83N / \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N ]\r
+6. \83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+Enter\82Ì\82Ý: \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+8. \93¯\8aú\82ð\83R\83~\83b\83g\82·\82é\r
+9. \96ß\82é\r
+\94Ô\8d\86 >8\r
+\r
+\81\9a[WARNING] \83x\81[\83X\82Æ\83\8f\81[\83N\82Å\93à\97e\82ª\88Ù\82È\82Á\82Ä\82¢\82½\82Ì\82ª\93¯\82¶\82É\82È\82è\82Ü\82µ\82½\81B\r
+\r
+\8cx\8d\90\82ª\82 \82è\82Ü\82µ\82½\82ª\81A\82æ\82ë\82µ\82¢\82Å\82·\82©(y/n)y\r
+-------------------------------------------------------------------------------\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSameToSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateWorkAlmostSameToSame.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSameToSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateWorkAlmostSameToSame.txt"\r
+\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
+-------------------------------------------------------------------------------\r
+\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSameToSame.txt"\r
+\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSameToSame.txt"\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82µ\82½\81B\r
+\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
+-------------------------------------------------------------------------------\r
+\81\9a\83x\81[\83X\81iBASE\81j: UpdateWorkAlmostSameToSame.txt (.\95s\95Ï)\r
+\81\9a\83\8f\81[\83N\81iWORK\81j: UpdateWorkAlmostSameToSame.txt (.\95s\95Ï)\r
+\r
+1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-\81i\82È\82µ\81j\r
+\82È\82µ\81i\93¯\8aú\8a®\97¹\81j\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 21/35 (60%%)\r
\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
97. \82·\82×\82Ä\82Ì\83t\83@\83C\83\8b\82ð\95\\8e¦\82·\82é\r
99. \8fI\97¹\r
\94Ô\8d\86 >99\r