![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Jul 2010 00:27:46 +0000 (17:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Jul 2010 20:53:20 +0000 (13:53 -0700) | ||
| commit | c008c0ff2087da7b98adfa760247776619b32224 | |
| tree | 6e31414f8d7a4a04bb85a4e9bcfae77a182f666c | tree | snapshot |
| parent | 29981380d03ffa63765dbeaea53a7ac9e8d6bc4f | commit | diff |
diff A...B: give one possible diff when there are more than one merge-base
We instead showed a combined diff that explains one of the randomly
chosen merge-base as if it were the result of merging all the other
merge bases and two tips given, which made no sense at all.
An alternative is to simply fail such a request, telling the user that
there are criss-cross merges, but it wouldn't be so helpful.
Noticed by James Pickens.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We instead showed a combined diff that explains one of the randomly
chosen merge-base as if it were the result of merging all the other
merge bases and two tips given, which made no sense at all.
An alternative is to simply fail such a request, telling the user that
there are criss-cross merges, but it wouldn't be so helpful.
Noticed by James Pickens.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-diff.c | diff | blob | history |