Fix stdin stream for interactive merge

Needed to rework how I was handling conflicting files w.r.t. interactive
prompts.  As it turns out, piping in find to the containing while loop
was cutting-off standard in from getting to the interactive read
prompts.

1 files changed, 3 insertions, 3 deletions

diff --git a/merge.sh b/merge.sh
index c693790..64a6bff 100644
--- a/merge.sh
+++ b/merge.sh
@@ -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}"