mergetools / gvimdiff2on commit Merge branch 'jk/grep-binary-workaround-in-test' (3163363)
   1. "$MERGE_TOOLS_DIR/vimdiff"