Bug 36570
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: |
|
2010-03-24 18:41 PDT, David Kilzer (:ddkilzer)
2010-03-24 18:42 PDT, David Kilzer (:ddkilzer)