mergetools / gvimdiff3on commit ls-remote.txt: delete unsupported option (29bc480)
   1. "$MERGE_TOOLS_DIR/vimdiff"