Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support zsh #289

Closed
wants to merge 2 commits into from
Closed

Support zsh #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a10de8
Adde code
May 6, 2024
0d7041d
Removed unused blank line script
May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions src/scripts/merge_tools/resolve-blank-lines
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/scripts/merge_tools/resolve-import-conflicts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# in files, as the default git mergetool does.

if [ "$#" -eq 0 ] ; then
readarray -t files < <(grep -l -r '^<<<<<<< HEAD' .)
files=($(grep -l -r '^<<<<<<< HEAD' .))
else
files=("$@")
fi
Expand Down
Loading