Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
Showing
1 changed file
with
122 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters