From 74004034a1dcb7a4d7681232114ad88cb76f40fd Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Sun, 1 Sep 2024 15:36:27 -0700 Subject: [PATCH] Spell-check --- src/scripts/merge_tools/merge_plumelib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/merge_tools/merge_plumelib.sh b/src/scripts/merge_tools/merge_plumelib.sh index 6b69dcc833..b13fc524c5 100755 --- a/src/scripts/merge_tools/merge_plumelib.sh +++ b/src/scripts/merge_tools/merge_plumelib.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh # usage: ./merge_plumelib.sh -# First runs `git merge`, then runs Plume-lib Merging to improve the ruselt of `git merge`. +# First runs `git merge`, then runs Plume-lib Merging to improve the result of `git merge`. # must contain a clone of a repository. # 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.