Ilya Grigoriev 55762e3681 Rename FileConflictData to ConflictHunk, use it in files.rs. ... There's no point in having two identical types used for the same purpose in two different places.		2022-12-03 15:12:40 -08:00
..
src	Rename FileConflictData to ConflictHunk, use it in files.rs.	2022-12-03 15:12:40 -08:00
tests	Rename FileConflictData to ConflictHunk, use it in files.rs.	2022-12-03 15:12:40 -08:00
testutils	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
build.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
Cargo.toml	cargo: bump insta from 1.21.1 to 1.21.2	2022-11-28 05:29:03 -10:00