diff --git a/three-way-merge-test.txt b/three-way-merge-test.txt
--- a/three-way-merge-test.txt
+++ b/three-way-merge-test.txt
@@ -3,10 +3,10 @@
 line 3
 line 4
 line 5
 line 6
 line 7
-line 8
+line 8 -- changed by patch
 line 9
 line 10
 line 11
 line 12