revset: remove duplicated definition of choice() from addset._iterordered()
choice() is already defined before val1 = None. Perhaps there was merge or
rebase error.
--- 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