From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Aug 2020 17:24:01 +0000 (-0700)
Subject: Merge branch 'es/adjust-subtree-test-for-merge-msg-update'
X-Git-Tag: v2.29.0-rc0~185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83b8250904d3c5e6107a70c27759e91160e139b0;p=thirdparty%2Fgit.git

Merge branch 'es/adjust-subtree-test-for-merge-msg-update'

Adjust tests in contrib/ to the recent change to fmt-merge-msg.

* es/adjust-subtree-test-for-merge-msg-update:
  Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
---

83b8250904d3c5e6107a70c27759e91160e139b0