File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed
lib/jblond/Diff/Renderer/Html Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -35,18 +35,21 @@ class Merged extends MainRenderer implements SubRendererInterface
35
35
'title1 ' => 'Version1 ' ,
36
36
'title2 ' => 'Version2 ' ,
37
37
];
38
+ /**
39
+ * @var int Line offset to keep correct line number for merged diff.
40
+ */
38
41
protected $ lineOffset = 0 ;
39
42
/**
40
- * @var string
43
+ * @var string last block of lines which where removed from version 2.
41
44
*/
42
45
protected $ lastDeleted ;
43
46
44
47
/**
45
48
* Merged constructor.
46
49
*
47
- * @param array $options Custom defined options for the inline diff renderer.
50
+ * @param array $options Custom defined options for the merged diff renderer.
48
51
*
49
- * @see Inline ::$subOptions
52
+ * @see Merged ::$subOptions
50
53
*/
51
54
public function __construct (array $ options = [])
52
55
{
You can’t perform that action at this time.
0 commit comments