mergetools / gvimdiff3on commit Merge branch 'mk/show-s-no-extra-blank-line-for-merges' (e7cc0ed)
   1. "$MERGE_TOOLS_DIR/vimdiff"