mergetools / gvimdiffon commit Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint (6d011b8)
   1. "$MERGE_TOOLS_DIR/vimdiff"