mergetools / vimdiff3on commit Merge branch 'jk/merge-file-exit-code' into maint (5c15ca0)
   1. "$MERGE_TOOLS_DIR/vimdiff"