Matt Chisholm

Results 6 issues of Matt Chisholm

Renaming a file to directory path that doesn't exist leaves fragments in an inconsistent state. It renames the file in `_fragments/` but fails to move the file to the new...

bug

Need XML/HTML diff mode When I fork based on ``` Foo ``` and ``` Bar ``` I want ``` ``` instead of a blank line.

enhancement

the fork command should have an auto-follow command-line option, enabled by default

enhancement

the apply command should have an auto-commit option, off by default

enhancement

apply should have a dry-run mode that will tell you whether it will generate conflicts, apply cleanly, etc.

enhancement

The apply command should have options to control whether to insert conflict sections or just leave the file unmodified when it encounters a conflict.

enhancement