vim: *.adoc is a asciidoc
tmux: reload
git: diff.renames=copies
git: merge.conflictstyle=diff3