diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-26 16:56:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-26 16:56:43 +0000 |
| commit | 4b176e6ca71e3e05157631372945f4917439b15b (patch) | |
| tree | d31a222f263b3e1bef9572d6ea046112f5ccc1b7 | |
| parent | 0fc07b96cef4c9c5ba2d6fe0299333201d5cfba8 (diff) | |
| download | forums-4b176e6ca71e3e05157631372945f4917439b15b.tar forums-4b176e6ca71e3e05157631372945f4917439b15b.tar.gz forums-4b176e6ca71e3e05157631372945f4917439b15b.tar.bz2 forums-4b176e6ca71e3e05157631372945f4917439b15b.tar.xz forums-4b176e6ca71e3e05157631372945f4917439b15b.zip | |
and once more with feeling
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9303 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/diff/diff.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index c54f139161..1533c4d7f3 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -511,9 +511,9 @@ class diff3 extends diff if ($edit->is_conflict()) { // Start conflict label - $label_start = array('<<< ' . $label1); - $label_mid = array('=== ' . $label_sep); - $label_end = array('>>> ' . $label2); + $label_start = array('<<<<<<< ' . $label1); + $label_mid = array('======= ' . $label_sep); + $label_end = array('>>>>>>> ' . $label2); $lines = array_merge($lines, $label_start, $edit->final1, $label_mid, $edit->final2, $label_end); } |