From 1efd6206c703a64e893e2d91b8befafc784bc60d Mon Sep 17 00:00:00 2001 From: Martin Marmsoler Date: Thu, 16 Feb 2023 19:17:41 +0100 Subject: [PATCH] Fix build --- test/rebase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/rebase.cpp b/test/rebase.cpp index 45541222..b8674d61 100644 --- a/test/rebase.cpp +++ b/test/rebase.cpp @@ -628,8 +628,8 @@ void TestRebase::abortMR() { int count) { QVERIFY(rebase.isValid()); QCOMPARE(count, 1); - QCOMPARE(before.message(), "File.txt changed by second - branch\n"); rebaseAboutToRebase++; + QCOMPARE(before.message(), "File.txt changed by secondbranch\n"); + rebaseAboutToRebase++; }); connect(mRepo.notifier(), &git::RepositoryNotifier::rebaseCommitInvalid, []() { QVERIFY(false); }); // Should not be called