git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 85b4e0a)
Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
authorEmily Shaffer <redacted>
Mon, 3 Aug 2020 18:57:49 +0000 (11:57 -0700)
committerJunio C Hamano <redacted>
Mon, 3 Aug 2020 19:48:00 +0000 (12:48 -0700)
commitb87528c4d7b0a28430da405f8f4b18f2fb8b953b
treefb919456d345608a411630be2cc4fd8205c10d48tree | snapshot
parent85b4e0a6dc8407de6f69808d9ee6debdf167ced3commit | diff
Revert "contrib: subtree: adjust test to change in fmt-merge-msg"

This reverts commit 508fd8e8baf3e18ee40b2cf0b8899188a8506d07.

In 6e6029a8 (fmt-merge-msg: allow merge destination to be omitted again)
we get back the behavior where merges against 'master', by default, do
not include "into 'master'" at the end of the merge message. This test
fix is no longer needed.

Signed-off-by: Emily Shaffer <redacted>
Signed-off-by: Junio C Hamano <redacted>
contrib/subtree/t/t7900-subtree.sh diff | blob | history
git clone https://git.99rst.org/PROJECT