mergetools / gvimdiff2on commit Merge branch 'jd/send-email-to-whom' into HEAD (1f7b196)
   1. "$MERGE_TOOLS_DIR/vimdiff"