![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ryan Anderson <ryan@michonline.com> | |
| Mon, 7 Aug 2006 12:11:24 +0000 (05:11 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 7 Aug 2006 18:46:04 +0000 (11:46 -0700) | ||
| commit | 7c49cb288173ab5264b3b9e4257aeeb13388334c | |
| tree | b998307b5b2e935477e3f75d01110e9c66fdf20c | tree | snapshot |
| parent | 1dcb69224ca4da3d97c502de88de73ec4b362082 | commit | diff |
annotate: Fix bug when parsing merges with differing real and logical parents.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-annotate.perl | diff | blob | history |