mergetools / gvimdiff2on commit Merge branch 'rs/logical-vs-binary-or' (02dfccf)
   1. "$MERGE_TOOLS_DIR/vimdiff"