Scott Taylor comments

Repositories
Issues
Comments

Results 33 comments of


                                            Scott Taylor

FR: Always show first side as snapshot when materializing conflicts

I actually ran into a case very quickly after enabling `diff-experimental` style where it gave a significantly worse diff: diff-experimental conflict markers ``` >>>>>> Conflict 1 of 1 ends ```...

FR: Consider removing "all:" revset prefix

> this might be a noob question, but how do I express my current: > > ``` > jj rebase -A "all:(one_hash|second_hash)" > ``` > > after deprecation? I believe...

FR: Materialize files with conflict markers (or any files) in a way that can be parsed

I think this issue can be closed now, since both files containing conflict markers and files missing terminating newlines are now materialized in a way that can be parsed. We...