diff --git a/src/scripts/merge_tools/git_hires_merge.sh b/src/scripts/merge_tools/git_hires_merge.sh
index b1912eb703..a463e936b0 100755
--- a/src/scripts/merge_tools/git_hires_merge.sh
+++ b/src/scripts/merge_tools/git_hires_merge.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./git-hires-merge.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./git_hires_merge.sh <clone_dir> <branch-1> <branch-2>
 
 clone_dir=$1
 branch1=$2
diff --git a/src/scripts/merge_tools/gitmerge_ort.sh b/src/scripts/merge_tools/gitmerge_ort.sh
index 51947da10e..d8a695734b 100755
--- a/src/scripts/merge_tools/gitmerge_ort.sh
+++ b/src/scripts/merge_tools/gitmerge_ort.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-ort.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_ort.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh b/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh
index 2a40212493..ef1a5df5f8 100755
--- a/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh
+++ b/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-ort-ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_ort_ignorespace.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_ort_imports.sh b/src/scripts/merge_tools/gitmerge_ort_imports.sh
index 221280a6e0..dcd8077ad7 100755
--- a/src/scripts/merge_tools/gitmerge_ort_imports.sh
+++ b/src/scripts/merge_tools/gitmerge_ort_imports.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-ort.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_ort_imports.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh b/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh
index 03770b22f7..324fdea7e3 100755
--- a/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh
+++ b/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-ort-ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_ort_imports_ignorespace.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_histogram.sh b/src/scripts/merge_tools/gitmerge_recursive_histogram.sh
index 8e239dd933..6453c6e00e 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_histogram.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_histogram.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-recursive-histogram.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_recursive_histogram.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh b/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh
index 3535ace430..812d2dcd18 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-recursive-histogram.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_recursive_ignorespace.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_DIR="$(dirname "$0")"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_minimal.sh b/src/scripts/merge_tools/gitmerge_recursive_minimal.sh
index 4c2aefb8ef..e7d916539a 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_minimal.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_minimal.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-recursive-minimal.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_recursive_minimal.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_myers.sh b/src/scripts/merge_tools/gitmerge_recursive_myers.sh
index df12c4306c..f95f093ba7 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_myers.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_myers.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-recursive-myers.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_recursive_myers.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_patience.sh b/src/scripts/merge_tools/gitmerge_recursive_patience.sh
index 6130ebbb4c..77e5a8e449 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_patience.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_patience.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-recursive-patience.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_recursive_patience.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_resolve.sh b/src/scripts/merge_tools/gitmerge_resolve.sh
index 928a97960a..859faf70e2 100755
--- a/src/scripts/merge_tools/gitmerge_resolve.sh
+++ b/src/scripts/merge_tools/gitmerge_resolve.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# usage: ./gitmerge-resolve.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_resolve.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/resolve-import-conflicts b/src/scripts/merge_tools/resolve-import-conflicts
index feaee8b83c..4b311eddc3 100755
--- a/src/scripts/merge_tools/resolve-import-conflicts
+++ b/src/scripts/merge_tools/resolve-import-conflicts
@@ -1,4 +1,5 @@
 #!/bin/bash
+# bash, not POSIX sh, because of "readarray".
 
 # This script edits files to remove conflict markers related to Java imports.
 # It works on all files given on the command line;