This reverts commit 260cf5c0, which appears to be a failed subtree merge, from the master branch.
Revert "Squashed 'qa/rpc-tests/python-bitcoinrpc/' content from commit..." #3878
pull jmcorgan wants to merge 1 commits into bitcoin:master from jmcorgan:undo_failed_subtree_merge changing 9 files +0 −193-
jmcorgan commented at 8:24 PM on March 15, 2014: contributor
-
da0b9d454e
Revert "Squashed 'qa/rpc-tests/python-bitcoinrpc/' content from commit e484743"
This reverts commit 260cf5c0a4754be39b05f6a247b8a354de7eced6.
-
laanwj commented at 9:53 AM on March 16, 2014: member
Huh?! what has happened here? Seems the whole tree is messed up.
Edit: ok I understand now, the bitcoinrpc tree was overlayed on the bitcoin tree at the root.
- laanwj referenced this in commit 16254b6e14 on Mar 16, 2014
- laanwj merged this on Mar 16, 2014
- laanwj closed this on Mar 16, 2014
- jmcorgan deleted the branch on Mar 16, 2014
- DrahtBot locked this on Sep 8, 2021
