opengeo/GeoGit — pull request #3 by jhudson (2011-10-26 04:11:34+00:00)
Title: MergeOp Functionality

The basic merge operation functionality; again this is not reliant on markles serialisation chagnes but they were pulled into my branch.

This pull request is reliant on the fetchop functionality in the FetchOp Pull Request https://github.com/opengeo/GeoGit/pull/2.