diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-06 12:53:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-10 18:27:42 -0700 |
| commit | 4d3fe0c5f342d0b00209916cf6951c2f8db414d2 (patch) | |
| tree | b4a36de7aaaf6c546f4b8798d92b0cefaa6522fa /git-resolve.sh | |
| parent | 2ab706a38fbe6f4adb2fd09806a5d5faf33d355f (diff) | |
| download | git-4d3fe0c5f342d0b00209916cf6951c2f8db414d2.tar.gz | |
[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>
Diffstat (limited to 'git-resolve.sh')
0 files changed, 0 insertions, 0 deletions