diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-02-17 16:25:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-17 16:25:04 -0800 |
| commit | d077db1df0aef3db479904429e8008d8fc0e3fb3 (patch) | |
| tree | c037ff1fc3775cd70f1a92346417f4024a15d709 /t/t7605-merge-resolve.sh | |
| parent | Merge branch 'hn/reftable-tests' (diff) | |
| parent | patch-id: fix scan_hunk_header on diffs with 1 line of before/after (diff) | |
| download | tgif-d077db1df0aef3db479904429e8008d8fc0e3fb3.tar.xz | |
Merge branch 'jz/patch-id-hunk-header-parsing-fix'
Unlike "git apply", "git patch-id" did not handle patches with
hunks that has only 1 line in either preimage or postimage, which
has been corrected.
* jz/patch-id-hunk-header-parsing-fix:
patch-id: fix scan_hunk_header on diffs with 1 line of before/after
patch-id: fix antipatterns in tests
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions