mergetools / vimdiff2on commit merge-recursive: give callers of handle_content_merge() access to contents (e62d112)
   1. "$MERGE_TOOLS_DIR/vimdiff"