mergetools / gvimdiff3on commit Merge branch 'cc/bisect-rev-parsing' (42618bc)
   1. "$MERGE_TOOLS_DIR/vimdiff"