[PATCH 3 of 4] [merge] add a tool to emulate old hgmerge's fallback $EDITOR mode

[Isaac Jurado]

Replying David Champion:
> +
> +editor.executable = /bin/sh
> +editor.args = -c "${VISUAL-${EDITOR-vi}} $local"

The ${var-value} expansion does not seem a very wise choice in this
case.  I think you should use ${var:-value}.

-- 
Isaac Jurado

"The noblest pleasure is the joy of understanding."
                                  Leonardo da Vinci