diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-10-25 01:35:31 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-25 01:45:22 -0700 |
| commit | 10b6d0129d062f4d5d8a7611023c3f8cc43f1eab (patch) | |
| tree | 840851adbd0f61a807311444b845244b25cf5492 /cnf | |
| parent | 978f3c6d514f0fcf9329d536cc43cf1230e23112 (diff) | |
| download | portage-10b6d0129d062f4d5d8a7611023c3f8cc43f1eab.tar.gz portage-10b6d0129d062f4d5d8a7611023c3f8cc43f1eab.tar.bz2 portage-10b6d0129d062f4d5d8a7611023c3f8cc43f1eab.zip | |
Add FEATURES=merge-sync, for bug #439584.
Diffstat (limited to 'cnf')
| -rw-r--r-- | cnf/make.globals | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index e53f1867f..47ee787c6 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -53,7 +53,7 @@ FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${ho # Default user options FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks - fixlafiles news parallel-fetch protect-owned + fixlafiles merge-sync news parallel-fetch protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch" |