[Webkit-unassigned] [Bug 36570] resolve-ChangeLogs: fall back to git-merge-file if ChangeLog can't be merged

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=36570


David Kilzer (ddkilzer) <ddkilzer at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|resolve-ChangeLogs:         |resolve-ChangeLogs: fall
                   |git-rebase fails when       |back to git-merge-file if
                   |resolve-ChangeLogs can't    |ChangeLog can't be merged
                   |merge                       |
           Platform|Other                       |All
         OS/Version|Mac OS X 10.5               |All
          Component|New Bugs                    |Tools / Tests




--- Comment #3 from David Kilzer (ddkilzer) <ddkilzer at webkit.org>  2010-03-24 18:42:52 PST ---
Please ignore the description in Comment #0.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.