15-merge.t: Updated test cases to check for conflict markers in MERGE…

…_MSG
jacquesg · Apr 17, 2014 · 6852128 · 6852128
1 parent d237912
commit 6852128
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/t/15-merge.t b/t/15-merge.t
@@ -119,7 +119,7 @@ $index -> add('test1');
 $index -> write;
 
 my $merge_msg = $repo -> message();
-is $merge_msg, "Merge branch 'branch2'\n";
+is $merge_msg, "Merge branch 'branch2'\n\nConflicts:\n\ttest1\n";
 
 $commit = $repo -> commit("Merge commit!", $me, $me, [$master -> target, $commit2],
 	$repo -> lookup($index -> write_tree));