Diffusion extension-TwoColConflict 8e1d77e42e96

Add tests and one new feature to SplitConflictMerger
8e1d77e42e96
Actions

Authored by thiemowmde on Nov 1 2018, 6:50 PM.

Tags

None

Subscribers

None

Description

Add tests and one new feature to SplitConflictMerger

This is split from If4d4845 (and because of this tagged as being part
of T195724). The two patches can be merged in any order, because the
edits to SplitConflictMerger are duplicated and do not conflict. I made
this a separate, independent patch to speed review up.

Bug: T195724
Change-Id: If855e60d3d40a7939d3ff11ebdd09f0ac82ac8c2

Details

Committed

Nov 1 2018, 6:50 PM

Parents

rESCC9e18f2ce41ce: Merge "Two-phase <textare> height calculation when activating edit mode"

Branches

Unknown

Tags

Unknown

References

refs/changes/62/471062/1

ChangeId

If855e60d3d40a7939d3ff11ebdd09f0ac82ac8c2

Event Timeline

thiemowmde committed rESCC8e1d77e42e96: Add tests and one new feature to SplitConflictMerger (authored by thiemowmde).Nov 1 2018, 6:50 PM

Changes (2)

				Path
	M			includes/SplitTwoColConflict/SplitConflictMerger.php
	A			tests/phpunit/SplitTwoColConflict/SplitConflictMergerTest.php

rESCC8e1d77e42e96

includes/SplitTwoColConflict/SplitConflictMerger.php

Loading...

tests/phpunit/SplitTwoColConflict/SplitConflictMergerTest.php

Loading...