Merge branch 'jn/mergetool-hideresolved-is-optional'