From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Mar 2020 18:21:20 +0000 (-0700)
Subject: Merge branch 'en/test-cleanup'
X-Git-Tag: v2.26.0-rc1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf372dc815f66409de85f558cfcd843d5d4832eb;p=thirdparty%2Fgit.git

Merge branch 'en/test-cleanup'

Test cleanup.

* en/test-cleanup:
  t6020: new test with interleaved lexicographic ordering of directories
  t6022, t6046: test expected behavior instead of testing a proxy for it
  t3035: prefer test_must_fail to bash negation for git commands
  t6020, t6022, t6035: update merge tests to use test helper functions
  t602[1236], t6034: modernize test formatting
---

cf372dc815f66409de85f558cfcd843d5d4832eb