mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-12 07:24:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
jj/demos/juggle_conflicts.svg
Ilya Grigoriev d3b0f1b970 demos: redact one of the conflict outputs 
I would prefer to shorten it instead of fully redacting, but I ran into
https://github.com/martinvonz/jj/issues/4239
2024-09-05 17:33:46 -07:00

122 lines
16 KiB
XML
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.