Merge branch 'js/params-vs-args'

Messages update.

* js/params-vs-args:
  replace "parameters" by "arguments" in error messages

diff --cc bisect.c
Simple merge

diff --cc builtin/stash.c
Simple merge

diff --cc builtin/tag.c
Simple merge

diff --cc t/t3301-notes.sh
index 4af881f0baa8628c7928606686fff356fffe03fd,f34c14bd8e9ac8a31f92f2a158466b9d74fbb931..d742be8840276a52ef5887659d5405e1f9b08404
--- 1/t/t3301-notes.sh
--- 2/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@@ -1293,18 -1293,18 +1293,18 @@@ test_expect_success 'GIT_NOTES_REWRITE_
        grep "replacement note 3" actual
  '
  
- test_expect_success 'git notes copy diagnoses too many or too few parameters' '
+ test_expect_success 'git notes copy diagnoses too many or too few arguments' '
        test_must_fail git notes copy 2>error &&
-       test_i18ngrep "too few parameters" error &&
+       test_i18ngrep "too few arguments" error &&
        test_must_fail git notes copy one two three 2>error &&
-       test_i18ngrep "too many parameters" error
+       test_i18ngrep "too many arguments" error
  '
  
 -test_expect_success 'git notes get-ref expands refs/heads/master to refs/notes/refs/heads/master' '
 +test_expect_success 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main' '
        test_unconfig core.notesRef &&
        sane_unset GIT_NOTES_REF &&
 -      echo refs/notes/refs/heads/master >expect &&
 -      git notes --ref=refs/heads/master get-ref >actual &&
 +      echo refs/notes/refs/heads/main >expect &&
 +      git notes --ref=refs/heads/main get-ref >actual &&
        test_cmp expect actual
  '
  

diff --cc t/t6030-bisect-porcelain.sh
Simple merge