mergetools / gvimdiff3on commit Merge branch 'rs/xdiff-hunk-with-func-line' into maint (fda65fa)
   1. "$MERGE_TOOLS_DIR/vimdiff"