Changes between Version 41 and Version 42 of UsingGitWithWebKit


Ignore:
Timestamp:
Feb 18, 2010, 7:55:38 AM (15 years ago)
Author:
vestbo@webkit.org
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • UsingGitWithWebKit

    v41 v42  
    113113  WebKitTools/Scripts/resolve-ChangeLogs path/to/ChangeLog [path/to/ChangeLog ...]
    114114}}}
    115  * Telling Git to use resolve-ChangeLogs as a merge-driver for ChangeLogs (assumes resolve-ChangeLogs is in your path)
     115 * Telling Git to use '''resolve-ChangeLogs''' automatically as a merge-driver for ChangeLogs (assumes resolve-ChangeLogs is in your path)
    116116{{{
    117117  git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"