diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2020-02-07 00:52:54 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-07 11:07:31 -0800 |
| commit | f3037657e8431073f0b240691877ca32baa142eb (patch) | |
| tree | 75f787232ca2626d2c2000453e77c93854141ccc /Documentation/git.txt | |
| parent | t6006: make hash size independent (diff) | |
| download | tgif-f3037657e8431073f0b240691877ca32baa142eb.tar.xz | |
t6024: update for SHA-256
To make this test work with SHA-256, compute two of the items in the
conflicted index entry. The other entry is a conflict within a conflict
and computing it is difficult, so use test_oid_cache to specify the
proper values for both hash algorithms.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git.txt')
0 files changed, 0 insertions, 0 deletions