boundlessgeo/GeoGit — pull request #508 by volaya (2013-11-25 15:01:20+00:00)
Title: Fixed issue with false conflicts being signaled when both branches had made exactly the same change

Fixes #507

Includes some code cleaning