can't mark conflict as resolved using jgit commit --all

[mikofski]

there is a fixme in the code

this needs to check the repository state and then change it to merge-resolved.

should be able to use

jgit ci --all

to commit resolved conflicts I think?