mergetools / gvimdiff3on commit Merge branch 'gb/apply-comment-typofix' (e0eeba2)
   1. "$MERGE_TOOLS_DIR/vimdiff"