summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMalf Furious <m@lfurio.us>2017-09-06 16:52:35 -0400
committerMalf Furious <m@lfurio.us>2017-09-06 16:52:35 -0400
commitcf67abdf0e7c29c69abdcb8e9c2ba995622eeb28 (patch)
tree82be4c58a56a36d2ffcb25bf86a1c62dada60f8e /.gitignore
parentee7d93c9d3371d149acb0be471d68ee166db74b8 (diff)
downloadsystrunk-cf67abdf0e7c29c69abdcb8e9c2ba995622eeb28.tar.gz
systrunk-cf67abdf0e7c29c69abdcb8e9c2ba995622eeb28.zip
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.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions