| commit | 7472c760521ad240b5a389d71a7b30037bd84b56 | [log] [tgz] |
|---|---|---|
| author | Hans Wennborg <hans@hanshq.net> | Tue Jan 13 00:07:31 2015 +0000 |
| committer | Hans Wennborg <hans@hanshq.net> | Tue Jan 13 00:07:31 2015 +0000 |
| tree | 0e7fae9a4849a7c888b19712bd9725ddf9d1ae37 | |
| parent | 589d1a16b5bd1a64dd7d60cbbfc0518b76642b1a [diff] |
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225737 91177308-0d34-0410-b5e6-96231b3b80d8