mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-11 23:08:03 +00:00
@joyously found `o` confusing because it's a valid change id prefix. I don't have much preference, but `●` seems fine. The "ascii", "ascii-large", and "legacy" graph styles still use "o". I didn't change `@` since it seems useful to have that match the symbol used on the CLI. I don't think we want to have users do something like `jj co ◎-`.
262 KiB
815x1306px
262 KiB
815x1306px
![](/mirrors/jj/raw/commit/78e9a1b34d8157ba435f9d1cf4de65a23ebce360/demos/resolve_conflicts.png)