diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-15 21:35:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-15 23:38:09 (GMT) |
| commit | 2c0ab4d49d294aa9127ce5616d2d6c4d12be8e74 (patch) | |
| tree | 88ab71859747aab36d6da8bd177bf49a0b6b1223 /git-merge-octopus.sh | |
| parent | f2b4f0a23b400f5760deb9251296d79eba83ab78 (diff) | |
| download | git-2c0ab4d49d294aa9127ce5616d2d6c4d12be8e74.zip git-2c0ab4d49d294aa9127ce5616d2d6c4d12be8e74.tar.gz git-2c0ab4d49d294aa9127ce5616d2d6c4d12be8e74.tar.bz2 | |
t9300: correct expected object names
The output the test #36 expects is bogus. There are no blob objects
whose names are 36a590... or 046d037... when this test was run.
It was left unnoticed only because compare_diff_raw, which only
cares about the add/delete/rename/copy was used to check the result.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions