summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-06 19:53:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-11 01:27:42 (GMT)
commit4d3fe0c5f342d0b00209916cf6951c2f8db414d2 (patch)
treeb4a36de7aaaf6c546f4b8798d92b0cefaa6522fa /git-merge-stupid.sh
parent2ab706a38fbe6f4adb2fd09806a5d5faf33d355f (diff)
downloadgit-4d3fe0c5f342d0b00209916cf6951c2f8db414d2.zip
git-4d3fe0c5f342d0b00209916cf6951c2f8db414d2.tar.gz
git-4d3fe0c5f342d0b00209916cf6951c2f8db414d2.tar.bz2
[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-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions