mergetools / gvimdiff2on commit cherry-pick: handle "-" after parsing options (d644c55)
   1. "$MERGE_TOOLS_DIR/vimdiff"