mergetools / gvimdiff2on commit Merge branch 'js/color-on-windows-comment' (627c9f2)
   1. "$MERGE_TOOLS_DIR/vimdiff"