mergetools / gvimdiffon commit Merge branch 'jc/send-email-sensible-encoding' (33a2eea)
   1. "$MERGE_TOOLS_DIR/vimdiff"