Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: fe858963a7c6088e8c9307e7aa5224176bad9641
https://github.com/WebKit/WebKit/commit/fe858963a7c6088e8c9307e7aa5224176bad9641
Author: Cam Braverman <cbraver...@apple.com>
Date: 2024-06-04 (Tue, 04 Jun 2024)
Changed paths:
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py
A Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/conflict.py
A Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/conflict_unittest.py
Log Message:
-----------
Add git-webkit conflict command.
rdar://125747569 (git-safari/webkit conflict command for engineers)
Reviewed by Jonathan Bedard.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/conflict.py: Added.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/conflict_unittest.py:
Added.
Canonical link: https://commits.webkit.org/279720@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
