boundlessgeo/GeoGit — pull request #503 by volaya (2013-11-22 14:18:08+00:00)
Title: Fixed resetOp, when used during conflict

Reseting a given path was not removing the conflict if the path corresponded to a version identical to the current one in the index

Fixes #502