Adde code

benedikt-schesch · May 6, 2024 · aab88af · aab88af
1 parent 0fc1a7f
commit aab88af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/scripts/merge_tools/resolve-adjacent-conflicts b/src/scripts/merge_tools/resolve-adjacent-conflicts
@@ -35,7 +35,7 @@
 DEBUG=0
 
 if [ "$#" -eq 0 ] ; then
-  readarray -t files < <(grep -l -r '^<<<<<<< HEAD' .)
+  files=($(grep -l -r '^<<<<<<< HEAD' .))
 else
   files=("$@")
 fi

diff --git a/src/scripts/merge_tools/resolve-blank-lines b/src/scripts/merge_tools/resolve-blank-lines
@@ -24,7 +24,7 @@
 # no option for ignoring blank lines.  This script addresses that shortcoming.
 
 if [ "$#" -eq 0 ] ; then
-  readarray -t files < <(grep -l -r '^<<<<<<< HEAD' .)
+  files=($(grep -l -r '^<<<<<<< HEAD' .))
 else
   files=("$@")
 fi

diff --git a/src/scripts/merge_tools/resolve-import-conflicts b/src/scripts/merge_tools/resolve-import-conflicts
@@ -21,7 +21,7 @@
 # in files, as the default git mergetool does.
 
 if [ "$#" -eq 0 ] ; then
-  readarray -t files < <(grep -l -r '^<<<<<<< HEAD' .)
+  files=($(grep -l -r '^<<<<<<< HEAD' .))
 else
   files=("$@")
 fi