mergetools / vimdiff3on commit Merge branch 'da/mergetool-xxdiff-hotkey' into maint (6d1f93a)
   1. "$MERGE_TOOLS_DIR/vimdiff"