summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools')
-rwxr-xr-xwebkit/tools/merge/merge.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/webkit/tools/merge/merge.py b/webkit/tools/merge/merge.py
index 1639ba4..e6cfd6b 100755
--- a/webkit/tools/merge/merge.py
+++ b/webkit/tools/merge/merge.py
@@ -132,8 +132,6 @@ def main(options, args):
options.dry_run, options.diff3_cmd)
merger.MergeDirectory("JavaScriptCore")
merger.MergeDirectory("WebCore")
- merger.MergeDirectory("WebKit")
- merger.MergeDirectory("WebKitLibraries")
UpdateWebKitMergeRevision(webkit_merge_revision_path, repository,
new_revision, options.dry_run)