mergetools / gvimdiff3on commit diff: --indent-heuristic is no longer experimental (bab7614)
   1. "$MERGE_TOOLS_DIR/vimdiff"