mergetools / vimdiff3on commit color: make "always" the same as "auto" in config (6be4595)
   1. "$MERGE_TOOLS_DIR/vimdiff"