Version 5.91

[vbslib/main.git] / _src / Test / tools / T_SyncFilesX / Files / T_SyncFilesX_3way2C3_EchoAnswer / MergedModified.txt

%MultiLine%\r
>Merge\r
\83R\83~\83b\83g\8dÏ\82Ý\83t\83@\83C\83\8b\82ª\93ü\82é\8fã\8bL\82Ì\83t\83H\83\8b\83_\81[\82ª\8c©\82Â\82©\82è\82Ü\82µ\82½\81B\r
%MultiLine%\r
\94Ô\8d\86\82Ü\82½\82Í\83R\83}\83\93\83h\96¼>1\r
%MultiLine%\r
\81¡\91O: "00_Base"\r
\81¡\8d¶\81iLef\81j: "01_Left"\r
\81¡\89E\81iRig\81j: "02_Right"\r
\81¡\8cã: "03_Merged"\r
\81¡\8dÏ: "04_Commit"\r
1. .!-  M\DeleteBoth.txt\r
2. -!*  M\UpdateBothSame_ForBase.txt\r
\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 5/10 (50%%)\r
%MultiLine%\r
99. \8fI\97¹\r
\94Ô\8d\86 >99\r
Pass.\r