| Age | Commit message (Collapse) | Author | Files | Lines | |
|---|---|---|---|---|---|
| 2017-09-06 | Fix stdin stream for interactive merge | Malf Furious | 1 | -3/+3 | |
| 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. | |||||
| 2017-09-06 | Spawn merge helper routines in a subshell | Malf Furious | 1 | -2/+2 | |
| This is to prevent those functions from overwriting variables used by the merge function. | |||||
| 2017-09-06 | Move merge pointer cleanup into systr_merge_finish | Malf Furious | 1 | -4/+6 | |
| This is to not break things if the user leaves interactive resolution and has to use systrunk apply-merge. | |||||
| 2017-09-06 | Add merge op | Malf Furious | 1 | -0/+178 | |
 |
index : systrunk | |
| Filesystem version control powered by rsync | malf |
| summaryrefslogtreecommitdiffstats |