mergetools / vimdiff2on commit diff: make the indent heuristic part of diff's basic configuration (cf5e772)
   1. "$MERGE_TOOLS_DIR/vimdiff"