opengeo/GeoGit — pull request #45 by volaya (2013-03-18 13:52:31+00:00)
Title: Patch conflict

This PR adds the merge conflicts, patch and diff functionality