summaryrefslogtreecommitdiffstats
path: root/merge.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2017-09-06Fix stdin stream for interactive mergeMalf Furious1-3/+3
2017-09-06Spawn merge helper routines in a subshellMalf Furious1-2/+2
2017-09-06Move merge pointer cleanup into systr_merge_finishMalf Furious1-4/+6
2017-09-06Add merge opMalf Furious1-0/+178