mergetools / gvimdiff2on commit Merge branch 'bk/refresh-missing-ok-in-merge-recursive' (156d6ed)
   1. "$MERGE_TOOLS_DIR/vimdiff"