diff --git a/gclient.py b/gclient.py index 9b6a3c0a25..03c9ac9061 100755 --- a/gclient.py +++ b/gclient.py @@ -2154,6 +2154,7 @@ def CMDrevert(parser, args): options.force = True options.reset = False options.delete_unversioned_trees = False + options.merge = False client = GClient.LoadCurrentConfig(options) if not client: raise gclient_utils.Error('client not configured; see \'gclient config\'')