makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

and once more with feeling

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9303 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-01-26 16:56:43 +00:00
parent 0fc07b96ce
commit 4b176e6ca7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/diff/diff.php
View file

@ -511,9 +511,9 @@ class diff3 extends diff
if ($edit->is_conflict()) if ($edit->is_conflict())
{ {
// Start conflict label // Start conflict label
$label_start = array('<<< ' . $label1); $label_start = array('<<<<<<< ' . $label1);
$label_mid = array('=== ' . $label_sep); $label_mid = array('======= ' . $label_sep);
$label_end = array('>>> ' . $label2); $label_end = array('>>>>>>> ' . $label2);
$lines = array_merge($lines, $label_start, $edit->final1, $label_mid, $edit->final2, $label_end); $lines = array_merge($lines, $label_start, $edit->final1, $label_mid, $edit->final2, $label_end);
} }