Update merge.sh to reflect usage of git.
authorMartin Liska <mliska@suse.cz>
Mon, 25 May 2020 18:55:29 +0000 (20:55 +0200)
committerMartin Liska <mliska@suse.cz>
Tue, 26 May 2020 06:48:14 +0000 (08:48 +0200)
commitb3d566f570f4416299240b51654b70c74f6cba6a
tree358a009fa9e9251af8a1d929f9ce8b6dd2aa9e9b
parent757dbb59c1f2cd88c84a6dc7dc038e4da750b035
Update merge.sh to reflect usage of git.

After switching to GIT, we should use it in libsanitizer
merge script. I'll do merge from master as soon as
PR95311 gets fixed.

I'm going to install the patch.

libsanitizer/ChangeLog:

* LOCAL_PATCHES: Use git hash instead of SVN id.
* merge.sh: Use git instead of VCS.  Update paths
relative to upstream git repository.
libsanitizer/LOCAL_PATCHES
libsanitizer/merge.sh