Martin von Zweigbergk a88b3dd2f5 cli: print a hint about how to resolve conflicts ... This prints a hint about using `jj new <first conflicted commit>` and `jj squash` to resolve conflicts. The hint is printed whenever there are new or resolved conflicts. I hope this hint will be useful especially for new users so they know which commit to resolve conflicts in first. It may not be obvious that they should start with the bottommost one. I hope the hint will also be useful for more more experienced user by letting them just copy the printed command without first running `jj log` to find the right commit..		2023-12-10 12:44:57 -08:00
..
examples	gc: implement basic GC for Git backend	2023-12-03 07:40:12 -08:00
src	cli: print a hint about how to resolve conflicts	2023-12-10 12:44:57 -08:00
testing
tests	cli: print a hint about how to resolve conflicts	2023-12-10 12:44:57 -08:00
build.rs
Cargo.toml	cargo: sort dependencies list alphabetically	2023-11-07 23:46:05 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00