diff options
Diffstat (limited to 'merge.sh')
-rw-r--r-- | merge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -109,14 +109,14 @@ function systr_merge echo "$commit" >.systr/MERG # resolve conflicts # - find .systr/merge/ -name '*\*' | while read file; + for file in `find .systr/merge/ -name '*\*'`; do orig=${file::-1} vimdiff "$orig" "$file" rm "$file" done - find .systr/merge/ -name '*~' | while read file; + for file in `find .systr/merge/ -name '*~'`; do name=${file::-1} echo "$name removed on $commit // {created on worktree}" @@ -139,7 +139,7 @@ function systr_merge done done - find .systr/merge/ -name '*\&' | while read file; + for file in `find .systr/merge/ -name '*\&'`; do name=${file::-1} echo "$name removed on worktree // {created on $commit}" |