Skip to content

Commit

Permalink
Spell-check
Browse files Browse the repository at this point in the history
  • Loading branch information
mernst committed Sep 1, 2024
1 parent aba36c1 commit 7400403
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/scripts/merge_tools/merge_plumelib.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env sh

# usage: ./merge_plumelib.sh <clone_dir> <branch-1> <branch-2> <git_strategy> <plumelib_strategy>
# 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`.
# <clone_dir> 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.
Expand Down

0 comments on commit 7400403

Please sign in to comment.