projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2ab706a) | patch
[PATCH] Add debugging help for case #16 to read-tree.c
authorJunio C Hamano <junkio@cox.net>
Tue, 6 Sep 2005 19:53:56 +0000 (12:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Sep 2005 01:27:42 +0000 (18:27 -0700)
commit4d3fe0c5f342d0b00209916cf6951c2f8db414d2
treeb4a36de7aaaf6c546f4b8798d92b0cefaa6522fatree | snapshot
parent2ab706a38fbe6f4adb2fd09806a5d5faf33d355fcommit | 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>
read-tree.c diff | blob | history
t/t1000-read-tree-m-3way.sh diff | blob | history
The core git plumbing