mirror of
https://github.com/git/git.git
synced 2026-02-01 11:34:05 +01:00
There is still a bug involving octopus merges, somewhere, but this gets normal merges correct, so it's still an improvement over the existing version. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
12 KiB
Executable File
12 KiB
Executable File