mergetools / gvimdiff3on commit Merge branch 'tz/doc-apostrophe-no-longer-needed' (c42986f)
   1. "$MERGE_TOOLS_DIR/vimdiff"