mergetools / gvimdiff3on commit cat-file: minor style fix in options list (ad42f28)
   1. "$MERGE_TOOLS_DIR/vimdiff"