Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/_interface/merge.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ In advance of the Mainnet merge, several public testnets will transition from Po
The first public testnet to merge will be Ropsten. As the Ropsten merge approaches, Geth
users will need to prepare to ensure a smooth transition.

{% include note.html content="The merge event did not go smoothly on Ropsten. Use `--override.terminaltotaldifficulty 50000000000000000` when launching Geth for Ropsten." %}
{% include note.html content="The merge event did not go smoothly on Ropsten. However, if you are running Geth v1.10.19 or later, no action is required. If you are running Geth v1.10.18 or earlier, you should use `--override.terminaltotaldifficulty 50000000000000000` when launching Geth for Ropsten." %}

### Consensus client

Expand Down