clean up weird merge code in test; add 1.13 to tests

Co-authored-by: Copilot <copilot@github.com>
Signed-off-by: Sean Corfield <sean@corfield.org>

Author: seancorfield

.gitignore

@@ -18,3 +18,4 @@
 bin/
 obj/
 target
+outdated.txt

deps.edn

@@ -3,7 +3,8 @@
            :1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
            :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
            :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}}
-           :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.4"}}}
+           :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.6"}}}
+           :1.13 {:override-deps {org.clojure/clojure {:mvn/version "1.13.0-alpha7"}}}
            :runner
            {:extra-deps {io.github.cognitect-labs/test-runner
                          {:git/tag "v0.5.1" :git/sha "dfb30dd"}}

run-tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for v in 9 10 11 12
+for v in 9 10 11 12 13
 do
   echo ""
   echo "Running tests for Clojure 1.$v..."

src/test/clojure/clojure/tools/cli_legacy_test.cljc

@@ -67,14 +67,11 @@
   (testing "merging args"
     (deftest should-merge-identical-arguments
       (let [assoc-fn (fn [previous key val]
-                       (assoc previous key
-                              (if-let [oldval (get previous key)]
-                                (merge oldval val)
-                                (hash-set val))))
-            [options args _] (cli ["-p" "1" "--port" "2"]
-                                  ["-p" "--port" "description"
-                                   :assoc-fn assoc-fn
-                                   :parse-fn #(parse-int %)])]
+                       (update previous key (fnil conj #{}) val))
+            [options _ _] (cli ["-p" "1" "--port" "2"]
+                               ["-p" "--port" "description"
+                                :assoc-fn assoc-fn
+                                :parse-fn #(parse-int %)])]
         (is (= {:port #{1 2}} options)))))
 
   (testing "extra arguments"