mergetools / gvimdiffon commit Merge branch 'rs/urlmatch-cleanup' (536c1ec)
   1. "$MERGE_TOOLS_DIR/vimdiff"