[PATCH 1 of 6] revset: remove duplicated definition of choice() from addset._iterordered()

[Yuya Nishihara]

# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1430143400 -32400
#      Mon Apr 27 23:03:20 2015 +0900
# Node ID 79bddb1b850de47b3db7a8c8abf1a8e749c9685e
# Parent  9a74b991958174460bf113ec5ddc74f85ee5a640
revset: remove duplicated definition of choice() from addset._iterordered()

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

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -3044,10 +3044,6 @@ class addset(abstractsmartset):
 
         val1 = None
         val2 = None
-
-        choice = max
-        if ascending:
-            choice = min
         try:
             # Consume both iterators in an ordered way until one is
             # empty