diff options
author | Ryan Anderson <ryan@michonline.com> | 2006-08-07 16:11:24 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-08-07 22:46:04 +0400 |
commit | 7c49cb288173ab5264b3b9e4257aeeb13388334c (patch) | |
tree | b998307b5b2e935477e3f75d01110e9c66fdf20c /builtin-repo-config.c | |
parent | 1dcb69224ca4da3d97c502de88de73ec4b362082 (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>
Diffstat (limited to 'builtin-repo-config.c')
0 files changed, 0 insertions, 0 deletions