# 
# 
# patch "tests/test_a_merge_8/correct"
#  from [73bfad77615751a3f83839df482b5bce395784e7]
#    to [fb2368af2ea9406e1821d5a2764ba283e631165b]
# 
# patch "tests/test_a_merge_8/left"
#  from [4dd9089ffd37bbaf4a678815e4c1a2ffd15de547]
#    to [f2ff120804471f9ffd81eca3021b86109d01e753]
# 
# patch "tests/test_a_merge_8/parent"
#  from [f629245675b8b8758dc7e7ea2b791cbc14c49de0]
#    to [46c8de56d485cc10465dba001fc613ae97925916]
# 
# patch "tests/test_a_merge_8/right"
#  from [dd8a37d2beb981759342a31933ba131ab58f6dd3]
#    to [d1ac442f26df0f4dad67dbf042997a39d5cdc9f3]
# 
============================================================
--- tests/test_a_merge_8/correct	73bfad77615751a3f83839df482b5bce395784e7
+++ tests/test_a_merge_8/correct	fb2368af2ea9406e1821d5a2764ba283e631165b
@@ -1,19 +1,14 @@
-// AN INITIAL COMMON LINE
-// A LINE FROM THE LEFT
-// ANOTHER COMMON LINE
+AN INITIAL COMMON LINE
+A LINE FROM THE LEFT
+ANOTHER COMMON LINE
 
-// SOME STUFF FROM THE RIGHT
+SOME STUFF FROM THE RIGHT
 
-	/*
-	 * Add the tuple info to the WriteSet.
-	 */
-	if ( txn_type == REPLICATED_LOCAL )
-	{
-	}
-// END OF STUFF FROM THE RIGHT
+THIS LINE EXISTS TWICE
+SOME MORE TEXT INSERTED BY RIGHT
+END OF STUFF FROM THE RIGHT
 
+THIS LINE EXISTS TWICE
+ANOTHER COMMON LINE (B)
+AN ADDITIONAL LINE FROM THE RIGHT
+A LAST COMMON LINE
-	/*
-	 * delete the tuple
-	 */
-// AN ADDITIONAL LINE FROM THE RIGHT
-// A LAST COMMON LINE
============================================================
--- tests/test_a_merge_8/left	4dd9089ffd37bbaf4a678815e4c1a2ffd15de547
+++ tests/test_a_merge_8/left	f2ff120804471f9ffd81eca3021b86109d01e753
@@ -1,8 +1,7 @@
-// AN INITIAL COMMON LINE
-// A LINE FROM THE LEFT
-// ANOTHER COMMON LINE
+AN INITIAL COMMON LINE
+A LINE FROM THE LEFT
+ANOTHER COMMON LINE
 
+THIS LINE EXISTS TWICE
+ANOTHER COMMON LINE (B)
+A LAST COMMON LINE
-	/*
-	 * delete the tuple
-	 */
-// A LAST COMMON LINE
============================================================
--- tests/test_a_merge_8/parent	f629245675b8b8758dc7e7ea2b791cbc14c49de0
+++ tests/test_a_merge_8/parent	46c8de56d485cc10465dba001fc613ae97925916
@@ -1,7 +1,6 @@
-// AN INITIAL COMMON LINE
-// ANOTHER COMMON LINE
+AN INITIAL COMMON LINE
+ANOTHER COMMON LINE
 
+THIS LINE EXISTS TWICE
+ANOTHER COMMON LINE (B)
+A LAST COMMON LINE
-	/*
-	 * delete the tuple
-	 */
-// A LAST COMMON LINE
============================================================
--- tests/test_a_merge_8/right	dd8a37d2beb981759342a31933ba131ab58f6dd3
+++ tests/test_a_merge_8/right	d1ac442f26df0f4dad67dbf042997a39d5cdc9f3
@@ -1,18 +1,13 @@
-// AN INITIAL COMMON LINE
-// ANOTHER COMMON LINE
+AN INITIAL COMMON LINE
+ANOTHER COMMON LINE
 
-// SOME STUFF FROM THE RIGHT
+SOME STUFF FROM THE RIGHT
 
-	/*
-	 * Add the tuple info to the WriteSet.
-	 */
-	if ( txn_type == REPLICATED_LOCAL )
-	{
-	}
-// END OF STUFF FROM THE RIGHT
+THIS LINE EXISTS TWICE
+SOME MORE TEXT INSERTED BY RIGHT
+END OF STUFF FROM THE RIGHT
 
+THIS LINE EXISTS TWICE
+ANOTHER COMMON LINE (B)
+AN ADDITIONAL LINE FROM THE RIGHT
+A LAST COMMON LINE
-	/*
-	 * delete the tuple
-	 */
-// AN ADDITIONAL LINE FROM THE RIGHT
-// A LAST COMMON LINE