Summary: | resolve-ChangeLogs: fall back to git-merge-file if ChangeLog can't be merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | David Kilzer (:ddkilzer) <ddkilzer> | ||||||
Component: | Tools / Tests | Assignee: | David Kilzer (:ddkilzer) <ddkilzer> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | cjerdonek, eric, evan, vestbo | ||||||
Priority: | P2 | ||||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | All | ||||||||
OS: | All | ||||||||
Attachments: |
|
Description
David Kilzer (:ddkilzer)
2010-03-24 18:41:03 PDT
Comment on attachment 51573 [details]
Patch
Wrong patch.
Created attachment 51574 [details]
Patch v1
Please ignore the description in Comment #0. Comment on attachment 51574 [details]
Patch v1
LGTM.
Attachment 51574 [details] was posted by a committer and has review+, assigning to David Kilzer for commit.
Committed r56483: <http://trac.webkit.org/changeset/56483> |