mergetools / gvimdiffon commit git log: support "auto" decorations (1571586)
   1. "$MERGE_TOOLS_DIR/vimdiff"