From 10b6d0129d062f4d5d8a7611023c3f8cc43f1eab Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 25 Oct 2012 01:35:31 -0700
Subject: Add FEATURES=merge-sync, for bug #439584.

---
 cnf/make.globals | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cnf')

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"
 
-- 
cgit v1.2.3-1-g7c22