mergetools / gvimdiff2on commit reset --hard: make use of the pretty machinery (1cf823f)
   1. "$MERGE_TOOLS_DIR/vimdiff"