tmux refactoring; git mergetool less `safe'