mergetools / gvimdiff3on commit ls-files: use correct format string (7cb7283)
   1. "$MERGE_TOOLS_DIR/vimdiff"