Changes between Version 30 and Version 31 of UpdatingBugzilla


Ignore:
Timestamp:
Apr 19, 2012 11:30:40 AM (12 years ago)
Author:
ddkilzer@apple.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • UpdatingBugzilla

    v30 v31  
    136136 * Clean up any conflicts when the merge is done.
    137137
    138  * Compare merged tree with bugzilla-4.2.1 tag to make sure there isn't any left-over cruft.  Remove any cruft found.
     138 * Compare merged tree with bugzilla-4.2 branch to make sure there isn't any left-over cruft.  Remove any cruft found.
    139139{{{
    140140    diff -urN -x .git -x .bzr bzr/bugzilla-4.2 bugzilla.git