mergetools / gvimdiff2on commit config.txt: move color.* to a separate file (0a7839e)
   1. "$MERGE_TOOLS_DIR/vimdiff"