mergetools / gvimdiff2on commit Merge branch 'cj/log-invert-grep' (1ba6e86)
   1. "$MERGE_TOOLS_DIR/vimdiff"