# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1430143400 -32400
# Node ID 405cb38448ad00e4345d234a06e857b569777ad8
# Parent  10bbdcd8916436f65aa0217b672528acaa0b3db8
revset: remove duplicated definition of choice() from addset._iterordered()

choice() is already defined before val1 = None. Perhaps there was merge or
rebase error.

diff -r 10bbdcd89164 -r 405cb38448ad mercurial/revset.py
--- a/mercurial/revset.py	Tue May 12 19:40:45 2015 -0500
+++ b/mercurial/revset.py	Mon Apr 27 23:03:20 2015 +0900
@@ -3044,10 +3044,6 @@
 
         val1 = None
         val2 = None
-
-        choice = max
-        if ascending:
-            choice = min
         try:
             # Consume both iterators in an ordered way until one is
             # empty