Mercurial > dnsbl

diff ChangeLog @ 149:9581f6e62574

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch to second context wins in all cases
author carl
date Mon, 19 Feb 2007 15:57:24 -0800
parents 9330b8d6a56b
children a23ef169d322
line wrap: on
line diff
--- a/ChangeLog	Tue Jan 30 16:27:49 2007 -0800
+++ b/ChangeLog	Mon Feb 19 15:57:24 2007 -0800
@@ -1,5 +1,10 @@
     $Id$
 
+5.28 2007-02-19
+    Change the conflict resolution algorithm to "second one wins" if we
+    have two contexts that both define env_to user@.  Update ICANN tld
+    list.
+
 5.27 2007-01-30
     Allow 'inherit' as an env_from target. Documentation cleanup
     from G.W. Haywood.