Noah Santschi-Cooney 551380a6ed fixes merger for when file is merged twice ... This happens in projects where an #include is normally guarded by #ifdef. File A conditionally includes either B or C based on an #ifdef. Both B and C include D, so D gets merged twice. Previously, the offset to which a file view has been created is stored globally. This means that the offset would be reused on a fresh include in the above situation. Solved by storing offsets keyed by the NodeIndex of the parent file that is including and the NodeIndex of the file being included.		2021-02-19 01:02:09 +00:00
..
src	fixes merger for when file is merged twice	2021-02-19 01:02:09 +00:00
testdata	adds support for relative vs absolute include path	2021-02-12 01:06:05 +00:00
.gitignore	TS + Rust Integration	2020-02-14 23:14:29 +00:00
Cargo.lock	v0.9.4	2021-02-13 18:39:29 +00:00
Cargo.toml	v0.9.4	2021-02-13 18:39:29 +00:00
Makefile	THE BIG MERGE v0.1	2020-08-03 01:57:19 +01:00