Commit 3d8f154f authored by Stephen Shirley's avatar Stephen Shirley Committed by Iustin Pop
Browse files

Revert "Disable the cluster-merge tool for the moment"

This reverts commit c0711f2c

Signed-off-by: default avatarStephen Shirley <>
Signed-off-by: default avatarIustin Pop <>
Reviewed-by: default avatarIustin Pop <>
parent 9c03a67a
# Copyright (C) 2010, 2011 Google Inc.
# Copyright (C) 2010 Google Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -493,9 +493,6 @@ def main():
(options, args) = parser.parse_args()
parser.error("Unfortunately this tool is currently broken and cannot"
" be used. Sorry!")
if not args:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment