From 74b59cff0a87b99731b257d9c8908f0f10e92700 Mon Sep 17 00:00:00 2001
From: blinry <sebastian@morr.cc>
Date: Mon, 12 Apr 2021 15:14:32 +0200
Subject: [PATCH] Double-check that players solved the "merging timelines"
 level correctly

Fixes #75.
---
 levels/merge/merge | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/levels/merge/merge b/levels/merge/merge
index 6be2eda..8b45d06 100644
--- a/levels/merge/merge
+++ b/levels/merge/merge
@@ -74,6 +74,9 @@ git branch -D main
 # Build a situation where you consumed a baguette, a coffee, *and* a donut.
 { git show HEAD:you | grep "You ate.*baguette"; } && { git show HEAD:you | grep "You drank.*coffee"; } && { git show HEAD:you | grep "You ate.*donut"; }
 
+# Be on a merge commit.
+test "$(git log --pretty=%P -n 1 HEAD | wc -w)" -ge 2
+
 [congrats]
 
 I wonder if you're more relaxed when you *sleep* in parallel timelines...