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

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

1
2
3
4
[user "admin"]
    password = admin
    role = "#admin"
    role = "#notfederated"