a3403e6828ee7cac9955b7ad7e420e087b62c700
renaming. I think directory renaming breaks the usual merges... because it leaves the 'to be removed' directory in the working directory still. A manual 'rm' of the 'to be removed' directory fixed the commit. svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
Description
No description provided
5 GiB
Languages
Nix
95%
Shell
2%
Python
1.8%
Rust
0.3%
JavaScript
0.2%
Other
0.4%