![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Paul Mackerras <paulus@dorrigo.(none)> | |
| Thu, 28 Jul 2005 03:15:47 +0000 (22:15 -0500) | ||
| committer | Paul Mackerras <paulus@samba.org> | |
| Thu, 28 Jul 2005 03:15:47 +0000 (22:15 -0500) | ||
| commit | 9d2a52eca1b5ea6c7beb351b45aa2aff092bbd6c | |
| tree | 2e3020c2f717dcf855a5047fc9173f2268f61268 | tree | snapshot |
| parent | 7eab29339bb856e314e799bbb57d945299c8cc51 | commit | diff |
Display the diffs for a merge in a unified fashion.
Stuff that ended up in the result is shown in bold with a "+" at the
beginning of the line; stuff that didn't is in the normal font with
a "-" at the beginning of the line. The color shows which parent
the stuff was in; red for the first parent, blue for the second, then
green, purple, brown, and the rest are grey. If the result is different
from all of the parents it is shown in black (and bold).
Stuff that ended up in the result is shown in bold with a "+" at the
beginning of the line; stuff that didn't is in the normal font with
a "-" at the beginning of the line. The color shows which parent
the stuff was in; red for the first parent, blue for the second, then
green, purple, brown, and the rest are grey. If the result is different
from all of the parents it is shown in black (and bold).
| gitk | diff | blob | history |