mergetools / gvimdiff3on commit Merge branch 'jk/mbox-from-line' into maint (b6e8269)
   1. "$MERGE_TOOLS_DIR/vimdiff"