Ilya Grigoriev acb0e9751d Add a Tree method to return conflicts matching a matcher ... This is useful for `jj resolve`.		2022-12-04 22:39:45 -08:00
..
src	Add a Tree method to return conflicts matching a matcher	2022-12-04 22:39:45 -08:00
tests	Rename FileConflictData to ConflictHunk, use it in files.rs.	2022-12-03 15:12:40 -08:00
testutils
build.rs
Cargo.toml	thrift: add legacy-thrift Cargo feature	2022-12-03 22:31:02 -08:00