opengeo/GeoGit — pull request #323 by volaya (2013-06-10 20:58:47+00:00)
Title: minor improvement to conflicts command and updated doc about merge confl...

...icts