opengeo/GeoGit — pull request #11 by jhudson (2012-05-28 02:14:40+00:00)
Title: added merge op strategies loaded from the application context xml file -...

... made the current MergeOp the default merging operation

The MergeOp loads the default merging strategy from the applicationContext,xml file which is for the moment the current merging operation algorithm (not a complete merging algorithm by any means). I have also added the reverse rebase merge strategy as an example of how a vendor would override merging with an online test showing operation.

I have change the MergeResult.result type to a diff which should give back the change made during the merge operation.

mvn test runs for all tests and pass. this change effects only the merge op algorithm choice and by default will operate as if nothing has changed since last commit.

**I have started moving packages into logical order with merge associated operations in the api.merge package.
**I have updated licences fro 2011 to 2012 where I have changed code.