add merge.log=true
add core.whitespace=...
add bindkey 'k' for kill-window
Revert "add bindkey 'k' for kill-window"

This reverts commit ded63c8dae9ca873a023a156b80e42116a3750f1.
add new key-bindings