Skip to content

Commit

Permalink
Further fix style
Browse files Browse the repository at this point in the history
  • Loading branch information
benedikt-schesch committed Sep 26, 2023
1 parent d84877a commit 9ebc8ca
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/scripts/merge_tools/gitmerge_ort_imports.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strateg
exit 0
fi

cd "$clone_dir"
cd "$clone_dir" || exit 1
if ! "$MERGE_SCRIPTS_DIR"/resolve-import-conflicts; then
exit 1
fi
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strateg
exit 0
fi

cd "$clone_dir"
cd "$clone_dir" || exit 1
if ! "$MERGE_SCRIPTS_DIR"/resolve-import-conflicts; then
exit 1
fi

0 comments on commit 9ebc8ca

Please sign in to comment.