mergetool: do not enable hideResolved by default