alexouzounis/svnmerge-plugin — pull request #5 by alexouzounis (2014-11-11 15:29:54+00:00)
Title: make sure we check for conflicted_unresolved as well as conflicted when

merging. Also add a fail safe such that if we fail to commit, a revert
occurs.