mergetools / gvimdiff2on commit Merge branch 'jn/bisect-coding-style' (117a355)
   1. "$MERGE_TOOLS_DIR/vimdiff"