Simon Wollwage 63771d6e84 cli: add option to list only conflicted branches ... As requested in #1471, I added a new flag for `jj branch list` to only show branches that are conflicted. Adds a unit test to check for listing only conflicted branches and regenerates the cli output to incorporate the new flag. Closes #1471 reformat		2024-03-23 22:04:14 +09:00
..
examples	templater: leverage TemplateProperty::map/and_then() helpers	2024-03-23 16:22:17 +09:00
src	cli: add option to list only conflicted branches	2024-03-23 22:04:14 +09:00
testing
tests	cli: add option to list only conflicted branches	2024-03-23 22:04:14 +09:00
build.rs
Cargo.toml	test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests	2024-03-22 23:27:25 -07:00
LICENSE