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
@@ -1,11 +1,11 @@
 line 1
 line 2
 line 3
 line 4
 line 5
-line 6
+line 6 -- changed by conflicting patch
 line 7
 line 8
 line 9
 line 10
 line 11