projects / portage.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e929ec1) | patch
Merged from trunk 5128:5129
authorFabian Groffen <grobian@gentoo.org>
Sun, 26 Nov 2006 11:01:12 +0000 (11:01 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sun, 26 Nov 2006 11:01:12 +0000 (11:01 -0000)
commit3088809c6a3826dbe7d520d3e9944484a5dc50d6
tree9e56b02b4bf7bc49e05cd85f03a8b1fe2212cdeftree | snapshot
parente929ec1a1c45577d21742c441be0889b29fdbf63commit | diff
Merged from trunk 5128:5129

For bug #8423, allow the merge phase to overwrite untouched config files
and also allow the unmerge phase to unmerge untouched config files.

svn path=/main/branches/prefix/; revision=5130
pym/portage.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.