From 6d7689f581da281587a999e82007dda283dd590b Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Wed, 28 May 2014 20:40:44 +0300
Subject: [ticket/12557] Fix var $preserve_cr description

PHPBB3-12557
---
 phpBB/includes/diff/diff.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/diff')

diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php
index 17fa726352..e16a549ef7 100644
--- a/phpBB/includes/diff/diff.php
+++ b/phpBB/includes/diff/diff.php
@@ -495,7 +495,8 @@ class diff3 extends diff
 	* @param array $orig		The original lines to use.
 	* @param array $final1		The first version to compare to.
 	* @param array $final2		The second version to compare to.
-	* @param bool $preserve_cr	If true, \r is replaced by a new line in the diff output
+	* @param bool $preserve_cr	If true, \r\n and bare \r are replaced by a new line
+	*							in the diff output
 	*/
 	function diff3(&$orig, &$final1, &$final2, $preserve_cr = true)
 	{
-- 
cgit v1.2.1