Lines Matching refs:merged
62 diffName => "'Merged' change",
64 Merged /trunk/Makefile:r33020
71 diffName => "'Reverse-merged' change",
73 Reverse-merged /trunk/Makefile:r33020
176 diffName => "'Reverse-merged' change followed by 'Merge' change",
178 Reverse-merged /trunk/Makefile:r33020
179 Merged /trunk/Makefile:r41697
181 expectedReturn => ["/trunk/Makefile:r33020", " Merged /trunk/Makefile:r41697\n"],
186 diffName => "'Merged' change followed by 'Merge' change",
188 Merged /trunk/Makefile:r33020
189 Merged /trunk/Makefile.shared:r58350
191 expectedReturn => ["/trunk/Makefile:r33020", " Merged /trunk/Makefile.shared:r58350\n"],
196 diffName => "'Reverse-merged' change followed by 'Reverse-merged' change",
198 Reverse-merged /trunk/Makefile:r33020
199 Reverse-merged /trunk/Makefile.shared:r58350
201 expectedReturn => ["/trunk/Makefile:r33020", " Reverse-merged /trunk/Makefile.shared:r58350\n"],
206 diffName => "'Reverse-merged' change followed by 'Reverse-merged' change followed by 'Merged' change",
208 Reverse-merged /trunk/Makefile:r33020
209 Reverse-merged /trunk/Makefile.shared:r58350
210 Merged /trunk/ChangeLog:r64190
212 expectedReturn => ["/trunk/Makefile:r33020", " Reverse-merged /trunk/Makefile.shared:r58350\n"],
213 expectedNextLine => " Merged /trunk/ChangeLog:r64190\n",
