![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 6 Sep 2005 19:53:56 +0000 (12:53 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 11 Sep 2005 01:27:42 +0000 (18:27 -0700) | ||
| commit | 4d3fe0c5f342d0b00209916cf6951c2f8db414d2 | |
| tree | b4a36de7aaaf6c546f4b8798d92b0cefaa6522fa | tree | snapshot |
| parent | 2ab706a38fbe6f4adb2fd09806a5d5faf33d355f | commit | diff |
[PATCH] Add debugging help for case #16 to read-tree.c
This will help us detect if real-world example merges have multiple
merge-base candidates and one of them matches one head while another
matches the other head.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This will help us detect if real-world example merges have multiple
merge-base candidates and one of them matches one head while another
matches the other head.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| read-tree.c | diff | blob | history | |
| t/t1000-read-tree-m-3way.sh | diff | blob | history |