mergetools / gvimdiff3on commit config: fix parsing of "git config --get-color some.key -1" (d0e08d6)
   1. "$MERGE_TOOLS_DIR/vimdiff"