diff options
Diffstat (limited to 'deps/v8/tools/release/merge_to_branch.py')
| -rwxr-xr-x | deps/v8/tools/release/merge_to_branch.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/v8/tools/release/merge_to_branch.py b/deps/v8/tools/release/merge_to_branch.py index c9594292b1..64f2a1981d 100755 --- a/deps/v8/tools/release/merge_to_branch.py +++ b/deps/v8/tools/release/merge_to_branch.py @@ -47,7 +47,7 @@ class Preparation(Step): if self._options.force: os.remove(self.Config("ALREADY_MERGING_SENTINEL_FILE")) elif self._options.step == 0: # pragma: no cover - self.Die("A merge is already in progress") + self.Die("A merge is already in progress. Use -f to continue") open(self.Config("ALREADY_MERGING_SENTINEL_FILE"), "a").close() self.InitialEnvironmentChecks(self.default_cwd) |