mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-05 19:14:43 +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 ◎-`.
246 KiB
815x1181px
246 KiB
815x1181px
![](/mirrors/jj/raw/commit/f4499aa65e91c5dbddc8521812444f5c4b51fd52/demos/juggle_conflicts.png)