Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/setup.py | 1 | 0 | 2 | 0 | -- | 1 | SM |
/wicd/wnettools.py | 4 | 4 | 231 | 176 | -- | 1 | SM |
/wicd/wicd-daemon.py | 3 | 3 | 345 | 37 | -- | 0 | SM |
/wicd/wicd-client.py | 1 | 1 | 4 | 9 | -- | 0 | UM |