[webkit-reviews] review cancelled: [Bug 15600] prepare-ChangeLog and update-webkit create needless ChangeLog conflicts : [Attachment 16779] Patch v1

[bugzilla-daemon at webkit.org]

David Kilzer (ddkilzer) <ddkilzer at webkit.org> has cancelled 's request for
review:
Bug 15600: prepare-ChangeLog and update-webkit create needless ChangeLog
conflicts
http://bugs.webkit.org/show_bug.cgi?id=15600

Attachment 16779: Patch v1
http://bugs.webkit.org/attachment.cgi?id=16779&action=edit

------- Additional Comments from David Kilzer (ddkilzer) <ddkilzer at webkit.org>
Clearing Darin's review+ flag. The update-webkit-diff3 script needs more work.

I think it needs to run diff3 and print its output to stdout instead of just
doing an "exit 1;", otherwise the merged file ends up blank.