mergetools / gvimdiff3on commit Merge branch 'ow/config-mailmap-pathname' (c37d326)
   1. "$MERGE_TOOLS_DIR/vimdiff"