Skip to content

Commit

Permalink
Clean up temporary file.
Browse files Browse the repository at this point in the history
  • Loading branch information
mernst committed Sep 23, 2024
1 parent f347dc1 commit 18a1a01
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/scripts/merge_tools/check-implementations.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ set -e

SCRIPTDIR="$(cd "$(dirname "$0")" && pwd -P)"

# Check for identical content.

## Check for identical content.

cd "$SCRIPTDIR"

Expand All @@ -20,10 +21,8 @@ diff -q ivn_ignorespace_plus.sh gitmerge_ort_ignorespace_plus.sh
diff -q ivn_ignorespace_plus.sh imports_ignorespace_plus.sh
diff -q ivn_ignorespace_plus.sh version_numbers_ignorespace_plus.sh

#


## These have an ignorespace version
## These have an ignorespace version.

tmpfile=$(mktemp)
tmpfile2=$(mktemp)
Expand Down Expand Up @@ -52,7 +51,7 @@ for base in gitmerge_ort gitmerge_recursive_myers ; do
done


## These do not have an ignorespace version
## These do not have an ignorespace version.

# "git_hires_merge.sh" has different diffs, so it is not included.
# TODO: Reinstate gitmerge_resolve
Expand All @@ -65,3 +64,4 @@ for base in gitmerge_recursive_histogram gitmerge_recursive_minimal \
done

rm -rf "$tmpfile"
rm -rf "$tmpfile2"

0 comments on commit 18a1a01

Please sign in to comment.