mergetools / gvimdiff3on commit Replace the proposed 'auto' mode with 'auto:' (2fd7c22)
   1. "$MERGE_TOOLS_DIR/vimdiff"