Code

History

Commits on encoding-fallback to gix-merge/src/commit/virtual_merge_base.rs9
  1. Replace lint allowances with expectationsCodex GPT-5 committed 4 months ago43ff87a
  2. Update crates to Rust 2024 editionGPT 5.5 committed 6 months ago2cb17b2
  3. feat!: model merge-bases as a non-empty type in `gix-revision` and `gix-merge`Sebastian Thiel committed 9 months ago231fda4
  4. refactorSebastian Thiel committed 11 months ago6f7b23a
  5. fix!: expose raw commit/tag actor headers for round-tripping.Pingasmaster committed 1 year ago1955b5b
  6. j fmtSebastian Thiel committed 1 year agoc3c6504
  7. feat!: replace `tree::Options::allow_lossy_resolution` with `*::tree_conflicts`.Sebastian Thiel committed 1 year ago1c3ba81
  8. feat!: Add more modes for checking for unresolved conflicts.Sebastian Thiel committed 2 years agoaff76f2
  9. feat!: add `commit::virtual_merge_base()` to produce the single merge-base to use.Sebastian Thiel committed 2 years ago9d43b75