diff options
| author | Ryan Anderson <ryan@michonline.com> | 2006-08-07 12:11:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-07 18:46:04 (GMT) |
| commit | 7c49cb288173ab5264b3b9e4257aeeb13388334c (patch) | |
| tree | b998307b5b2e935477e3f75d01110e9c66fdf20c /Documentation/git-repo-config.txt | |
| parent | 1dcb69224ca4da3d97c502de88de73ec4b362082 (diff) | |
| download | git-7c49cb288173ab5264b3b9e4257aeeb13388334c.zip git-7c49cb288173ab5264b3b9e4257aeeb13388334c.tar.gz git-7c49cb288173ab5264b3b9e4257aeeb13388334c.tar.bz2 | |
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 'Documentation/git-repo-config.txt')
0 files changed, 0 insertions, 0 deletions