| commit | e2ed4324b0b99fd3cb93bd14b6e1599c6fcbfe23 | [log] [tgz] |
|---|---|---|
| author | Paul Mackerras <paulus@dorrigo.(none)> | Sun Jul 17 03:39:44 2005 -0400 |
| committer | Paul Mackerras <paulus@dorrigo.(none)> | Sun Jul 17 03:39:44 2005 -0400 |
| tree | b1c6f7f2c9a646109a9089b4e56a5c846c99614a | |
| parent | 14c9dbd69bfed89011f99278c7f293b0d186ffc7 [diff] |
First cut at displaying the diffs for a merge. We display the files where the child differs from the first parent first in black in the file list window, followed by the second parent in blue, and so on using different colors for each parent (provided you don't have more than 6 parents; if you do we cycle around).