diff options
| author | Taylor Blau <me@ttaylorr.com> | 2026-05-11 20:46:51 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-05-12 10:36:18 +0900 |
| commit | 49369d8290c3a5c95d835df85fdf53eba7562496 (patch) | |
| tree | bd311bf98384a7b3933c2c23725260cbe347bd44 /t/t4013/diff.diff_initial..side | |
| parent | bc2f6115693874b2e8feed80ff5539743d257920 (diff) | |
t5333: demonstrate various pseudo-merge bugs
Using the test helper introduced via the previous commit, add various
failing tests demonstrating bugs in the pseudo-merge implementation.
These are all marked as failing with one exception. The "sampleRate=0"
test describes a latent bug, which is only reachable through a code path
that is itself masked by a separate bug. A future commit will fix that
bug, and, in turn, cause the aforementioned test to fail. Accordingly,
that commit will mark the test as failing, and it will be re-marked as
passing in a separate commit which fixes the once-latent bug.
For the rest: the following commits will explain and fix the underlying
bugs in detail.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions
