From ecb03d3be41f56d00cb0f6c32636052f5e2a7626 Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <exa.exa@gmail.com>
Date: Sun, 31 Aug 2025 13:11:27 +0200
Subject: [PATCH] tiny fix

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index edd5cd0..f5e54e0 100644
--- a/README.md
+++ b/README.md
@@ -228,8 +228,8 @@ work with `git rebase` that runs in the "merge mode" (which is the default).
 
 As a possible source of confusion, the "my" and "your" versions are somewhat swapped (as implied by semantics):
 
-- With `git checkout mybranch; git merge otherbranch`, the conflicts contents
-  will contain roughly:
+- With `git checkout mybranch; git merge otherbranch`, the conflicts will look
+  roughly like this:
   ```
   <<<<< mybranch version ||||| merge base ===== otherbranch version >>>>>
   ```