US: Unstructured Merge; S: Purely Structured Merge; AT: Auto-Tuning
| |
|
Files |
Conflicts |
Lines |
Runtime |
| Project |
Revision |
UM |
SM |
AT |
UM |
SM |
AT |
UM |
SM |
AT |
UM |
SM |
AT |
| DrJava |
rev3734-3786 |
7 |
3 |
3 |
17 |
6 |
6 |
99 |
163 |
163 |
5556 |
95582 |
39398 |
| DrJava |
rev3734-3788 |
7 |
3 |
3 |
18 |
6 |
6 |
131 |
163 |
163 |
5557 |
100648 |
44350 |
| DrJava |
rev3734-3807 |
8 |
2 |
2 |
28 |
4 |
4 |
876 |
73 |
73 |
5663 |
69549 |
11692 |
| DrJava |
rev4989-5004 |
2 |
3 |
2 |
10 |
12 |
11 |
499 |
125 |
95 |
6029 |
95760 |
22869 |
| DrJava |
rev4989-5019 |
11 |
1 |
1 |
27 |
1 |
1 |
160 |
2 |
2 |
6186 |
83276 |
13749 |
| DrJava |
rev4989-5044 |
23 |
1 |
0 |
48 |
1 |
0 |
265 |
2 |
0 |
6278 |
81310 |
16619 |
| DrJava |
rev4989-5058 |
5 |
1 |
0 |
13 |
1 |
0 |
133 |
4 |
0 |
6163 |
81592 |
14812 |
| DrJava |
rev5319-5330 |
2 |
2 |
2 |
15 |
4 |
4 |
236 |
10 |
10 |
6158 |
145662 |
68712 |
| DrJava |
rev5319-5332 |
1 |
1 |
1 |
11 |
3 |
3 |
165 |
8 |
8 |
6150 |
145734 |
70869 |
| Freecol |
rev5884-5962 |
5 |
3 |
2 |
5 |
7 |
6 |
363 |
17 |
15 |
5160 |
74649 |
7307 |
| Freecol |
rev5884-6055 |
9 |
4 |
4 |
14 |
8 |
8 |
1094 |
328 |
328 |
5285 |
75085 |
9579 |
| Freecol |
rev5884-6110 |
8 |
2 |
2 |
18 |
9 |
9 |
1121 |
621 |
621 |
5276 |
75268 |
9600 |
| Freecol |
rev5884-6265 |
12 |
4 |
3 |
30 |
15 |
14 |
1766 |
684 |
680 |
5355 |
75738 |
10803 |
| Freecol |
rev5884-6362 |
20 |
8 |
6 |
42 |
45 |
24 |
2630 |
863 |
806 |
5458 |
78238 |
13333 |
| Freecol |
rev5884-6440 |
72 |
56 |
55 |
257 |
243 |
223 |
5784 |
2383 |
2330 |
5924 |
87671 |
34643 |
| Freecol |
rev5884-6616 |
119 |
97 |
96 |
480 |
403 |
383 |
6358 |
2788 |
2735 |
6157 |
89137 |
47010 |
| Freecol |
rev5884-6672 |
123 |
99 |
98 |
488 |
404 |
384 |
6884 |
3044 |
2991 |
6205 |
90245 |
48095 |
| Freecol |
rev5884-6742 |
124 |
103 |
101 |
497 |
431 |
405 |
7985 |
3230 |
3162 |
6220 |
91477 |
48572 |
| Freecol |
rev5884-6843 |
134 |
106 |
104 |
511 |
438 |
412 |
9229 |
3494 |
3426 |
6219 |
87880 |
49211 |
| GenealogyJ |
rev5531-5561 |
1 |
0 |
0 |
1 |
0 |
0 |
3 |
0 |
0 |
4017 |
54710 |
4513 |
| GenealogyJ |
rev5531-5725 |
3 |
3 |
3 |
15 |
5 |
5 |
89 |
75 |
75 |
3950 |
52353 |
4728 |
| GenealogyJ |
rev5537-5610 |
28 |
20 |
20 |
68 |
23 |
23 |
556 |
188 |
188 |
4108 |
54049 |
9364 |
| GenealogyJ |
rev5537-5673 |
28 |
20 |
20 |
68 |
23 |
23 |
556 |
188 |
188 |
4032 |
52881 |
9402 |
| GenealogyJ |
rev5676-6013 |
1 |
0 |
0 |
1 |
0 |
0 |
3 |
0 |
0 |
3929 |
52942 |
4310 |
| GenealogyJ |
rev5676-6125 |
1 |
0 |
0 |
1 |
0 |
0 |
3 |
0 |
0 |
3848 |
52995 |
4323 |
| GenealogyJ |
rev6127-6244 |
2 |
1 |
1 |
2 |
1 |
1 |
30 |
16 |
16 |
4445 |
61138 |
5955 |
| GenealogyJ |
rev6127-6310 |
4 |
2 |
2 |
5 |
2 |
2 |
56 |
38 |
38 |
4455 |
61860 |
6218 |
| GenealogyJ |
rev6127-6410 |
4 |
1 |
1 |
5 |
1 |
1 |
94 |
22 |
22 |
4504 |
61223 |
5794 |
| GenealogyJ |
rev6127-6531 |
5 |
1 |
1 |
6 |
1 |
1 |
106 |
22 |
22 |
4451 |
59632 |
6546 |
| Jmol |
rev11338-11438 |
4 |
3 |
2 |
9 |
3 |
2 |
350 |
20 |
10 |
4721 |
299620 |
211114 |
| Jmol |
rev11338-11538 |
9 |
6 |
5 |
25 |
12 |
11 |
521 |
67 |
57 |
4786 |
297964 |
213165 |
| Jmol |
rev11338-11638 |
15 |
8 |
7 |
35 |
17 |
16 |
667 |
78 |
68 |
4893 |
288328 |
208357 |
| Jmol |
rev11338-11738 |
23 |
13 |
12 |
57 |
35 |
34 |
1070 |
203 |
193 |
4970 |
281843 |
203392 |
| Jmol |
rev11338-11838 |
34 |
19 |
18 |
78 |
46 |
45 |
1637 |
333 |
323 |
5068 |
329436 |
270839 |
| Jmol |
rev11338-11938 |
35 |
20 |
19 |
87 |
48 |
47 |
1703 |
344 |
334 |
5080 |
344811 |
277888 |
| Jmol |
rev11338-12038 |
42 |
22 |
22 |
100 |
53 |
53 |
1869 |
593 |
593 |
5041 |
355751 |
289234 |
| PMD |
rev5929-6010 |
1 |
0 |
0 |
1 |
0 |
0 |
5 |
0 |
0 |
4155 |
42865 |
4371 |
| PMD |
rev5929-6135 |
3 |
2 |
2 |
3 |
2 |
2 |
22 |
17 |
17 |
4136 |
43667 |
4875 |
| PMD |
rev5929-6198 |
7 |
3 |
3 |
12 |
4 |
4 |
784 |
342 |
342 |
3407 |
34931 |
4635 |
| PMD |
rev5929-6296 |
9 |
5 |
5 |
14 |
6 |
6 |
734 |
349 |
349 |
3360 |
33896 |
4833 |
| PMD |
rev5929-6425 |
9 |
5 |
5 |
14 |
6 |
6 |
727 |
349 |
349 |
2842 |
29597 |
4640 |
| PMD |
rev5929-6595 |
12 |
9 |
9 |
20 |
12 |
12 |
670 |
462 |
462 |
2814 |
29879 |
5373 |
| PMD |
rev5929-6700 |
13 |
11 |
11 |
24 |
15 |
15 |
1003 |
539 |
539 |
2836 |
30182 |
5507 |
| PMD |
rev5929-6835 |
12 |
10 |
10 |
21 |
16 |
16 |
939 |
506 |
506 |
2775 |
30094 |
5419 |
| PMD |
rev5929-7018 |
16 |
12 |
12 |
27 |
18 |
18 |
1053 |
510 |
510 |
2793 |
28456 |
6169 |
| PMD |
rev5929-7073 |
17 |
13 |
13 |
32 |
19 |
19 |
977 |
498 |
498 |
2817 |
30117 |
6400 |
| SQuirrel_SQL |
rev4007-4051 |
1 |
0 |
0 |
1 |
0 |
0 |
4 |
0 |
0 |
16938 |
215394 |
18358 |
| SQuirrel_SQL |
rev4007-4103 |
3 |
1 |
1 |
7 |
1 |
1 |
299 |
7 |
7 |
16968 |
222290 |
19273 |
| SQuirrel_SQL |
rev4007-4212 |
11 |
6 |
6 |
22 |
8 |
8 |
1384 |
108 |
108 |
16831 |
213916 |
21380 |
| SQuirrel_SQL |
rev4007-4321 |
17 |
7 |
7 |
31 |
9 |
9 |
3862 |
164 |
164 |
16906 |
216931 |
23217 |
| SQuirrel_SQL |
rev4007-4394 |
21 |
10 |
10 |
36 |
12 |
12 |
4218 |
357 |
357 |
16902 |
212638 |
23996 |
| SQuirrel_SQL |
rev4007-4516 |
25 |
12 |
12 |
42 |
15 |
15 |
4258 |
414 |
414 |
16955 |
224109 |
25483 |
| SQuirrel_SQL |
rev4007-4908 |
33 |
13 |
13 |
50 |
18 |
18 |
6111 |
420 |
420 |
16644 |
208173 |
26564 |
| SQuirrel_SQL |
rev4007-5081 |
34 |
15 |
15 |
52 |
20 |
20 |
4574 |
615 |
615 |
16524 |
209951 |
26406 |
| SQuirrel_SQL |
rev5082-5155 |
2 |
1 |
1 |
3 |
1 |
1 |
17 |
50 |
50 |
23351 |
286927 |
25940 |
| SQuirrel_SQL |
rev5082-5351 |
4 |
3 |
3 |
7 |
3 |
3 |
194 |
9 |
9 |
23275 |
292464 |
27264 |
| iText |
rev2818-3036 |
24 |
20 |
17 |
55 |
65 |
60 |
2897 |
569 |
451 |
4501 |
105082 |
18275 |
| iText |
rev2818-3191 |
178 |
155 |
155 |
178 |
1834 |
1834 |
115577 |
6284 |
6284 |
5949 |
135344 |
130619 |
| iText |
rev2818-3306 |
234 |
204 |
204 |
234 |
2097 |
2097 |
133913 |
6943 |
6943 |
7206 |
366823 |
345364 |
| iText |
rev2818-3392 |
249 |
230 |
230 |
249 |
2263 |
2263 |
138768 |
7791 |
7791 |
7851 |
406303 |
389471 |
| iText |
rev2818-3560 |
261 |
226 |
226 |
261 |
2098 |
2098 |
142685 |
7391 |
7391 |
7984 |
430900 |
426416 |
| iText |
rev2818-3625 |
264 |
243 |
243 |
264 |
2358 |
2358 |
136078 |
7825 |
7825 |
7929 |
411803 |
404812 |
| iText |
rev2818-3988 |
252 |
225 |
225 |
252 |
2059 |
2059 |
135368 |
7794 |
7794 |
7790 |
387069 |
404926 |
| iText |
rev2818-4022 |
235 |
218 |
218 |
235 |
2005 |
2005 |
132585 |
7067 |
7067 |
8091 |
463090 |
407869 |
| jEdit |
rev4676-4998 |
2 |
0 |
0 |
3 |
0 |
0 |
28 |
0 |
0 |
3584 |
49316 |
4033 |
| jEdit |
rev16588-16755 |
2 |
2 |
2 |
2 |
2 |
2 |
9 |
7 |
7 |
5405 |
76507 |
6840 |
| jEdit |
rev16588-16883 |
2 |
1 |
1 |
2 |
1 |
1 |
9 |
2 |
2 |
5411 |
75910 |
6811 |
| jEdit |
rev16588-17060 |
2 |
2 |
2 |
3 |
2 |
2 |
24 |
4 |
4 |
5420 |
76301 |
6921 |
| jEdit |
rev16588-17316 |
2 |
2 |
2 |
3 |
2 |
2 |
20 |
4 |
4 |
5377 |
75085 |
6926 |
| jEdit |
rev16588-17492 |
2 |
2 |
2 |
3 |
2 |
2 |
20 |
4 |
4 |
5375 |
76129 |
6876 |
| jEdit |
rev16588-17551 |
2 |
2 |
2 |
3 |
2 |
2 |
20 |
4 |
4 |
5381 |
77070 |
6932 |
| jEdit |
rev16883-16964 |
6 |
4 |
4 |
20 |
7 |
7 |
192 |
100 |
100 |
5435 |
73973 |
7359 |