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

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

1
2
3
4
5
6
7
[new] 
    duration = 365
    organizationalUnit = Gitblit
    organization = Gitblit
    locality = Gitblit
    stateProvince = NY 
    countryCode = US