_src/Test/tools/T_Diff/Files/Merge/MergeSetting.xml

   1 <?xml version="1.0" encoding="Shift_JIS"?>\r
   2 <ThreeWayMerge>\r
   3 \r
   4 <ThreeWayMergeSet\r
   5     left_name ="\8d¶"\r
   6     right_name="\89E"\r
   7     base_path ="00_Base"\r
   8     left_path ="01_Left"\r
   9     right_path="02_Right"\r
  10     merged_path="03_Merged">\r
  11 \r
  12 <File  base_path="0_ModifyBoth.txt"   left_path="1_ModifyBoth.txt"   right_path="2_ModifyBoth.txt"   merged_path="3_ModifyBoth.txt"/>\r
  13 <File  base_path="0_ModifyLeft.txt"   left_path="1_ModifyLeft.txt"   right_path="2_ModifyLeft.txt"   merged_path="3_ModifyLeft.txt"/>\r
  14 <File  base_path="0_ModifyRight.txt"  left_path="1_ModifyRight.txt"  right_path="2_ModifyRight.txt"  merged_path="3_ModifyRight.txt"/>\r
  15 <File  base_path="0_Stay.txt"         left_path="1_Stay.txt"         right_path="2_Stay.txt"         merged_path="3_Stay.txt"/>\r
  16 <File                                 left_path="1_AddLeft.txt"                                      merged_path="3_AddLeft.txt"/>\r
  17 <File                                                                right_path="2_AddRight.txt"     merged_path="3_AddRight.txt"/>\r
  18 <File                                 left_path="1_AddBoth.txt"      right_path="2_AddBoth.txt"      merged_path="3_AddBoth.txt"/>\r
  19 <File                                 left_path="1_AddBothEqual.txt" right_path="2_AddBothEqual.txt" merged_path="3_AddBothEqual.txt"/>\r
  20 <File                                 left_path="1_AddBothLF.txt"    right_path="2_AddBothLF.txt"    merged_path="3_AddBothLF.txt"/>\r
  21 <File  base_path="0_DeleteByLeft.txt"                                right_path="2_DeleteByLeft.txt" merged_path="3_DeleteByLeft.txt"/>\r
  22 <File  base_path="0_DeleteByRight.txt"  left_path="1_DeleteByRight.txt"                              merged_path="3_DeleteByRight.txt"/>\r
  23 <Folder  base_path="0"                left_path="1"                  right_path="2"                  merged_path="3"/>\r
  24 \r
  25 </ThreeWayMergeSet>\r
  26 \r
  27 \r
  28 ======================================================================\r
  29 Embedded Merge Rules\r
  30 \r
  31 <IsAutoMergeEx>True</IsAutoMergeEx>\r
  32 <IsOutEach>True</IsOutEach>\r
  33 <SingletonKeywords>Single</SingletonKeywords>\r
  34 <SingletonKeywords>#include</SingletonKeywords>\r
  35 <UniqueLineKeywords>Unique</UniqueLineKeywords>\r
  36 \r
  37 <BreakStepNum></BreakStepNum>\r
  38 \r
  39 \r
  40 ======================================================================\r
  41 Copied from "Merge.replace.xml".\r
  42 \r
  43 <ReplaceTemplate  before="#Before1"  after="#After1"/>\r
  44 <ReplaceTemplate  before="#Before2"  after="#After2"/>\r
  45 <ReplaceTemplate  before="#Before3"  after="#After3"/>\r
  46 <ReplaceTemplate  before="#Before4"  after="#After4"/>\r
  47 <ReplaceTemplate  before="#Before5_AddBoth"    after="#After5_AddBoth"/>\r
  48 <ReplaceTemplate  before="#Before5_AddBothLF"  after="#After5_AddBothLF"/>\r
  49 \r
  50 \r
  51 <Text id="Before1"><![CDATA[\r
  52 ----------------------------------------------------------------------------\r
  53 <<<<<<< Left.txt\r
  54 Both\r
  55 LLL\r
  56 ||||||| Base.txt\r
  57 8\r
  58 9\r
  59 =======\r
  60 Both\r
  61 RRR\r
  62 >>>>>>> Right.txt\r
  63 ----------------------------------------------------------------------------\r
  64 ]]></Text>\r
  65 \r
  66 \r
  67 <Text id="After1"><![CDATA[\r
  68 ----------------------------------------------------------------------------\r
  69 Both\r
  70 LLL\r
  71 RRR\r
  72 ----------------------------------------------------------------------------\r
  73 ]]></Text>\r
  74 \82±\82Ì\92u\82«\8a·\82¦\82Í\8ds\82í\82ê\82Ü\82·\81B\r
  75 \r
  76 \r
  77 <Text id="Before2"><![CDATA[\r
  78 ----------------------------------------------------------------------------\r
  79 <<<<<<< Left.txt\r
  80 ||||||| Base.txt\r
  81 Both\r
  82 LLL\r
  83 =======\r
  84 LLL\r
  85 >>>>>>> Right.txt\r
  86 ${Middle}\r
  87 <<<<<<< Left.txt\r
  88 RRR\r
  89 ||||||| Base.txt\r
  90 ${Base}\r
  91 =======\r
  92 >>>>>>> Right.txt\r
  93 ----------------------------------------------------------------------------\r
  94 ]]></Text>\r
  95 \r
  96 \r
  97 <Text id="After2"><![CDATA[\r
  98 ----------------------------------------------------------------------------\r
  99 Both\r
 100 LLL\r
 101 ${Base}\r
 102 ----------------------------------------------------------------------------\r
 103 ]]></Text>\r
 104 \r
 105 \r
 106 <Text id="Before3"><![CDATA[\r
 107 ----------------------------------------------------------------------------\r
 108 <<<<<<< Left.txt\r
 109 Single B\r
 110 ||||||| Base.txt\r
 111 Single A\r
 112 =======\r
 113 Single C\r
 114 >>>>>>> Right.txt\r
 115 ----------------------------------------------------------------------------\r
 116 ]]></Text>\r
 117 \r
 118 \r
 119 <Text id="After3"><![CDATA[\r
 120 ----------------------------------------------------------------------------\r
 121 Single ABC\r
 122 ----------------------------------------------------------------------------\r
 123 ]]></Text>\r
 124 \83V\83\93\83O\83\8b\83g\83\93 \83L\81[\83\8f\81[\83h\82Ì\8f\88\97\9d\82ª\90æ\82É\8ds\82í\82ê\82é\82½\82ß\81A\82±\82Ì\92u\82«\8a·\82¦\82Í\8ds\82í\82ê\82Ü\82¹\82ñ\81B\r
 125 \r
 126 \r
 127 <Text id="Before4"><![CDATA[\r
 128 ----------------------------------------------------------------------------\r
 129 <<<<<<< Left.txt\r
 130 ${Left}\r
 131 ||||||| Base.txt\r
 132 \82T\r
 133 =======\r
 134 ${Right}\r
 135 >>>>>>> Right.txt\r
 136 ----------------------------------------------------------------------------\r
 137 ]]></Text>\r
 138 \r
 139 \r
 140 <Text id="After4"><![CDATA[\r
 141 ----------------------------------------------------------------------------\r
 142 \r
 143 ${Left}\r
 144 \r
 145 ${Right}\r
 146 \r
 147 ----------------------------------------------------------------------------\r
 148 ]]></Text>\r
 149 \r
 150 \r
 151 <Text id="Before5_AddBoth"><![CDATA[\r
 152 ----------------------------------------------------------------------------\r
 153 /* AddLeft2 */\r
 154 \r
 155 /* AddRight2 */\r
 156 ----------------------------------------------------------------------------\r
 157 ]]></Text>\r
 158 <Text id="After5_AddBoth"><![CDATA[\r
 159 ----------------------------------------------------------------------------\r
 160 /* AddLeft2/AddRight2 */\r
 161 ----------------------------------------------------------------------------\r
 162 ]]></Text>\r
 163 \r
 164 \r
 165 <Text id="Before5_AddBothLF"  cut_indent="yes"><![CDATA[\r
 166 ----------------------------------------------------------------------------\r
 167 /* AddLeft2 */\n\r
 168 \n\r
 169 /* AddRight2 */\n\r
 170 ----------------------------------------------------------------------------\r
 171 ]]></Text>\r
 172 <Text id="After5_AddBothLF"  cut_indent="yes"><![CDATA[\r
 173 ----------------------------------------------------------------------------\r
 174 /* AddLeft2/AddRight2 */\n\r
 175 ----------------------------------------------------------------------------\r
 176 ]]></Text>\r
 177 \r
 178 \r
 179 </ThreeWayMerge>\r