mergetools / gvimdiff2on commit Merge branch 'sa/send-email-dedup-some-headers' (c50f76a)
   1. "$MERGE_TOOLS_DIR/vimdiff"