Re: [PATCH 06/29] t6036: fix broken "merge fails but has appropriate contents" tests

2018-06-26 Thread Elijah Newren
On Tue, Jun 26, 2018 at 12:29 AM, Eric Sunshine wrote: > These tests reference non-existent object "c" when they really mean to > be referencing "C", however, this error went unnoticed due to a broken > &&-chain later in the test. Fix these errors, as well as the broken > &&-chains behind which

[PATCH 06/29] t6036: fix broken "merge fails but has appropriate contents" tests

2018-06-26 Thread Eric Sunshine
These tests reference non-existent object "c" when they really mean to be referencing "C", however, this error went unnoticed due to a broken &&-chain later in the test. Fix these errors, as well as the broken &&-chains behind which they hid. Signed-off-by: Eric Sunshine ---