Document exit status 2

benedikt-schesch · Sep 2, 2024 · 4d972a9 · 4d972a9
1 parent 3e3f8bb
commit 4d972a9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/scripts/merge_tools/gitmerge.sh b/src/scripts/merge_tools/gitmerge.sh
@@ -4,7 +4,7 @@
 # <clone_dir> must contain a clone of a repository.
 # <strategy> is arguments to `git merge`, including -s and possibly -X.
 # Merges branch2 into branch1, in <clone_dir>, using merge strategy <strategy>.
-# Return code is 0 for merge success, 1 for merge failure.
+# Return code is 0 for merge success, 1 for merge failure, 2 for script failure.
 # For merge failure, also outputs "Conflict" and aborts the merge.
 
 set -o nounset

diff --git a/src/scripts/merge_tools/intellimerge.sh b/src/scripts/merge_tools/intellimerge.sh
@@ -3,7 +3,7 @@
 # usage: ./intellimerge.sh <clone_dir> <branch-1> <branch-2>
 # <clone_dir> must contain a clone of a repository.
 # Merges branch2 into branch1, in <clone_dir>.
-# Return code is 0 for merge success, 1 for merge failure.
+# Return code is 0 for merge success, 1 for merge failure, 2 for script failure.
 # For merge failure, also outputs "Conflict" and aborts the merge.
 
 set -o nounset

diff --git a/src/scripts/merge_tools/spork.sh b/src/scripts/merge_tools/spork.sh
@@ -3,7 +3,7 @@
 # usage: ./spork.sh <clone_dir> <branch-1> <branch-2>
 # <clone_dir> must contain a clone of a repository.
 # Merges branch2 into branch1, in <clone_dir>.
-# Return code is 0 for merge success, 1 for merge failure.
+# Return code is 0 for merge success, 1 for merge failure, 2 for script failure.
 # For merge failure, also outputs "Conflict" and aborts the merge.
 
 set -o nounset