Fixed bug in merge: improper use of force and failing on FORCED result

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

1
2
#!/bin/bash
java -cp gitblit.jar com.gitblit.authority.Launcher --baseFolder data