aboutsummaryrefslogtreecommitdiff
path: root/src/merkleblock.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-05-04 07:56:03 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-05-04 08:01:58 +0200
commit00e76db8c2253d431ced1c2b31a793f7332ffd40 (patch)
treee835d7c716a3fb9de7165b156696280b1df63bb8 /src/merkleblock.cpp
parentaa9fa938d9ba739575533246087e0a4177d22d10 (diff)
parentb05a89b2def301704df8f22f05a45ccf891c2b83 (diff)
downloadbitcoin-00e76db8c2253d431ced1c2b31a793f7332ffd40.tar.xz
Merge pull request #6085
b05a89b Non-grammatical language improvements (Luke Dashjr) 7e6d23b Bugfix: Grammar fixes (Corinne Dashjr)
Diffstat (limited to 'src/merkleblock.cpp')
-rw-r--r--src/merkleblock.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index dc87d0377a..4d90fd8cd7 100644
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -119,8 +119,8 @@ uint256 CPartialMerkleTree::TraverseAndExtract(int height, unsigned int pos, uns
if (pos*2+1 < CalcTreeWidth(height-1)) {
right = TraverseAndExtract(height-1, pos*2+1, nBitsUsed, nHashUsed, vMatch);
if (right == left) {
- // If the left and right branch should never be identical as the transaction
- // hashes covered by them must be unique.
+ // The left and right branches should never be identical, as the transaction
+ // hashes covered by them must each be unique.
fBad = true;
}
} else {