mergetools / gvimdiffon commit Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto (aebd235)
   1. "$MERGE_TOOLS_DIR/vimdiff"