Lines Matching refs:Merged
61 diffName => "'Merged' change",
63 Merged /trunk/Makefile:r33020
70 diffName => "'Reverse-merged' change",
72 Reverse-merged /trunk/Makefile:r33020
175 diffName => "'Reverse-merged' change followed by 'Merge' change",
177 Reverse-merged /trunk/Makefile:r33020
178 Merged /trunk/Makefile:r41697
180 expectedReturn => ["/trunk/Makefile:r33020", " Merged /trunk/Makefile:r41697\n"],
185 diffName => "'Merged' change followed by 'Merge' change",
187 Merged /trunk/Makefile:r33020
188 Merged /trunk/Makefile.shared:r58350
190 expectedReturn => ["/trunk/Makefile:r33020", " Merged /trunk/Makefile.shared:r58350\n"],
195 diffName => "'Reverse-merged' change followed by 'Reverse-merged' change",
197 Reverse-merged /trunk/Makefile:r33020
198 Reverse-merged /trunk/Makefile.shared:r58350
200 expectedReturn => ["/trunk/Makefile:r33020", " Reverse-merged /trunk/Makefile.shared:r58350\n"],
205 diffName => "'Reverse-merged' change followed by 'Reverse-merged' change followed by 'Merged' change",
207 Reverse-merged /trunk/Makefile:r33020
208 Reverse-merged /trunk/Makefile.shared:r58350
209 Merged /trunk/ChangeLog:r64190
211 expectedReturn => ["/trunk/Makefile:r33020", " Reverse-merged /trunk/Makefile.shared:r58350\n"],
212 expectedNextLine => " Merged /trunk/ChangeLog:r64190\n",
