opengeo/GeoGit — pull request #257 by volaya (2013-04-30 11:30:40+00:00)
Title: Revert conflicts

Improves handling of conflicted situations in revert operation