From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jun 2018 20:22:36 +0000 (-0700)
Subject: Merge branch 'en/merge-recursive-tests'
X-Git-Tag: v2.19.0-rc0~190
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93b74a7cfa47b636c060b033bc7d03319f7841e2;p=thirdparty%2Fgit.git

Merge branch 'en/merge-recursive-tests'

Clean up tests in t6xxx series about 'merge' command.

* en/merge-recursive-tests:
  t6036: prefer test_when_finished to manual cleanup in following test
  t6036, t6042: prefer test_cmp to sequences of test
  t6036, t6042: prefer test_path_is_file, test_path_is_missing
  t6036, t6042: use test_line_count instead of wc -l
  t6036, t6042: use test_create_repo to keep tests independent
---

93b74a7cfa47b636c060b033bc7d03319f7841e2