Release merge script: don't actually commit the merge
authorHans Wennborg <hans@hanshq.net>
Tue, 13 Jan 2015 00:07:31 +0000 (00:07 +0000)
committerHans Wennborg <hans@hanshq.net>
Tue, 13 Jan 2015 00:07:31 +0000 (00:07 +0000)
commit427e1214b44b6fb3110119db7d9d3018eecb770f
tree75e54aa63803b8886fd69a20ce189f7d24fe69b0
parent68aaa4daf526e553eb994feedda3f0e711e6bee5
Release merge script: don't actually commit the merge

Instead, just present the command for committing it. This way,
the user can test the merge locally, resolve conflicts, etc.
before committing, which seems much safer to me.

llvm-svn: 225737
llvm/utils/release/merge.sh