mergetools / gvimdiff2on commit Merge branch 'jk/ui-color-always-to-auto' (5a66930)
   1. "$MERGE_TOOLS_DIR/vimdiff"