mergetools / gvimdiff2on commit Merge branch 'jk/send-email-complete-aliases' (c69d08d)
   1. "$MERGE_TOOLS_DIR/vimdiff"