mergetools / gvimdiff3on commit Merge branch 'sv/typofix-apply-error-message' (aa6bdbb)
   1. "$MERGE_TOOLS_DIR/vimdiff"