Re: [PATCH v6 1/3] vimdiff: new implementation with layout support

[Fernando Ramos <greenfoo@u92.eu>]

> > +################################################################################
> > +## Internal functions (not meant to be used outside this script)
> > +################################################################################
> > +
> > +debug_print () { 
> > +	# Send message to stderr if global variable DEBUG is set to "true"
> 
> This should also be GIT_MERGETOOL_VIMDIFF_DEBUG, right?

Good catch! I'll fix it in v7.


> > +gen_cmd () {
> > +	# This function returns (in global variable FINAL_CMD) the string that
> > +	# you can use when invoking "vim" (as shown next) to obtain a given
> > +	# layout:
> > +	#
> > +	#   $ vim -f $FINAL_CMD "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
> > +	#
> > +	# It takes one single argument: a string containing the desired layout
> > +	# definition.
> > +	#
> > +	# The syntax of the "layout definitions" is explained in ... (TODO)...
> 
> Is this still TODO ?

No. I need to point to "Documentation/mergetools/vimdiff.txt".

I also noticed that the next paragraph was also not updated after the delimiters
were changed (from ";", "-" and "|" to "+", "/" and ",").

I'll fix both issues in v7.

Thanks!