mergetools / gvimdiff2on commit Merge branch 'jc/url-match' (a0a08d4)
   1. "$MERGE_TOOLS_DIR/vimdiff"