diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-07-06 15:50:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-07-06 15:50:25 -0700 |
| commit | 83fd231fc6831f56953c93ee5778bfb83ee05582 (patch) | |
| tree | 771760ad4b68fa3fbbe844de42fbe0ba0c4df981 /t/t4013/diff.diff_initial..side | |
| parent | a4d2e8a074a9ee95dfef1f7da21b5fbe0108f3f6 (diff) | |
| parent | eaad121fefb3c5845a52aba8952435096a172154 (diff) | |
Merge branch 'sg/t3420-do-not-grep-in-missing-file'
A test checking interactions between git rebase --quit and
autostash in t3420-rebase-autostash.sh has been corrected to use
test_path_is_missing instead of ! grep on a file that shouldn't
exist in the conflicted state.
* sg/t3420-do-not-grep-in-missing-file:
t3420-rebase-autostash: don't try to grep non-existing files
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions