mergetools / vimdiff3on commit Merge branch 'sb/merge-recursive-code-cleanup' (2f4bcd8)
   1. "$MERGE_TOOLS_DIR/vimdiff"