SZEDER Gábor [off-list ref] writes:
quoted
+ test_must_fail git merge-file \
+ -L "HEAD" \
+ -L "" \
+ -L "A^0" \
+ ours empty theirs &&
+ git hash-object b >actual &&
+ git hash-object ours >expect &&
+ test_cmp ours b
Here, however, you only changed what test_cmp looks at, but still kept
the two 'git hash-object' invocations, and their output will never be
looked at.
Thanks for quickly responding to a problem report and coming up with
a solution with further polishing, all.