Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2017-09-06 | Fix stdin stream for interactive merge | Malf Furious | 1 | -3/+3 |
2017-09-06 | Spawn merge helper routines in a subshell | Malf Furious | 1 | -2/+2 |
2017-09-06 | Move merge pointer cleanup into systr_merge_finish | Malf Furious | 1 | -4/+6 |
2017-09-06 | Add merge op | Malf Furious | 1 | -0/+178 |