mergetools / gvimdiff3on commit Merge branch 'bw/mailmap' (d076ad1)
   1. "$MERGE_TOOLS_DIR/vimdiff"