mirror of
https://github.com/Murmele/Gittyup.git
synced 2024-11-09 04:43:14 +03:00
Fix build
This commit is contained in:
parent
33d8cdc157
commit
1efd6206c7
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user